Browse Source

Fix suspicious | and + operators

Rafał Mikrut 5 years ago
parent
commit
d0621b954b

+ 1 - 1
modules/visual_script/visual_script_property_selector.cpp

@@ -355,7 +355,7 @@ void VisualScriptPropertySelector::get_visual_node_names(const String &root_filt
 			continue;
 			continue;
 		}
 		}
 
 
-		bool in_modifier = false | p_modifiers.empty();
+		bool in_modifier = p_modifiers.empty();
 		for (Set<String>::Element *F = p_modifiers.front(); F && in_modifier; F = F->next()) {
 		for (Set<String>::Element *F = p_modifiers.front(); F && in_modifier; F = F->next()) {
 			if (E->get().findn(F->get()) != -1)
 			if (E->get().findn(F->get()) != -1)
 				in_modifier = true;
 				in_modifier = true;

+ 1 - 1
platform/android/export/export.cpp

@@ -337,7 +337,7 @@ class EditorExportPlatformAndroid : public EditorExportPlatform {
 							Vector<String> props = dp.split("\n");
 							Vector<String> props = dp.split("\n");
 							String vendor;
 							String vendor;
 							String device;
 							String device;
-							d.description + "Device ID: " + d.id + "\n";
+							d.description = "Device ID: " + d.id + "\n";
 							d.api_level = 0;
 							d.api_level = 0;
 							for (int j = 0; j < props.size(); j++) {
 							for (int j = 0; j < props.size(); j++) {