Merge branch 'master' into pico_sdk

libs/main/types/pibytearray.h

@@ -1107,9 +1107,11 @@ public:
 	PIByteArray & append(const PIByteArray & data_) {
 #ifdef CC_GCC
 #  pragma GCC diagnostic push
-#  pragma GCC diagnostic ignored "-Wstringop-overflow"
 #  pragma GCC diagnostic ignored "-Warray-bounds"
-#  pragma GCC diagnostic ignored "-Wrestrict"
+#  ifndef ANDROID
+#	pragma GCC diagnostic ignored "-Wstringop-overflow"
+#	pragma GCC diagnostic ignored "-Wrestrict"
+#  endif
 #endif
 		const size_t ps = size();
 		enlarge(data_.size_s());

libs/main/types/pivaluetree.cpp

@@ -217,7 +217,7 @@ PIValueTree & PIValueTree::child(const PIStringList & path) {
 	if (_is_null || path.isEmpty()) return *this;
 	PIValueTree * ret = &child(path[0]);
 	for (int i = 1; i < path.size_s(); ++i)
-		ret = &child(path[i]);
+		ret = &(ret->child(path[i]));
 	return *ret;
 }