summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafał Mikrut <mikrutrafal54@gmail.com>2020-02-23 09:28:54 +0100
committerRafał Mikrut <mikrutrafal54@gmail.com>2020-02-23 09:28:54 +0100
commitd0621b954b182bb5f30b256ec70a45d821985e58 (patch)
tree818d84ed510c2fd9745efb8fdfcd266535ba0109
parent63b0d822d109f3612d5c22e4342ebef9cd3b9163 (diff)
Fix suspicious | and + operators
-rw-r--r--modules/visual_script/visual_script_property_selector.cpp2
-rw-r--r--platform/android/export/export.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/visual_script/visual_script_property_selector.cpp b/modules/visual_script/visual_script_property_selector.cpp
index 22f696851f..51b77659c4 100644
--- a/modules/visual_script/visual_script_property_selector.cpp
+++ b/modules/visual_script/visual_script_property_selector.cpp
@@ -355,7 +355,7 @@ void VisualScriptPropertySelector::get_visual_node_names(const String &root_filt
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()) {
if (E->get().findn(F->get()) != -1)
in_modifier = true;
diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp
index 2679d9db92..50bf671a84 100644
--- a/platform/android/export/export.cpp
+++ b/platform/android/export/export.cpp
@@ -337,7 +337,7 @@ class EditorExportPlatformAndroid : public EditorExportPlatform {
Vector<String> props = dp.split("\n");
String vendor;
String device;
- d.description + "Device ID: " + d.id + "\n";
+ d.description = "Device ID: " + d.id + "\n";
d.api_level = 0;
for (int j = 0; j < props.size(); j++) {