diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-23 10:30:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-23 10:30:06 +0100 |
| commit | 223c5ef8a3d07aa9b7fe226764ac473319c2d9cd (patch) | |
| tree | 9f8492a95a3452e7a7807d8e7ca88cc36ef0fc01 | |
| parent | c9e1d98c6287a00cd003f19e57207da6e174d6b4 (diff) | |
| parent | d0621b954b182bb5f30b256ec70a45d821985e58 (diff) | |
Merge pull request #36478 from qarmin/supsicious_operators_everywhere
Fix suspicious | and + operators
| -rw-r--r-- | modules/visual_script/visual_script_property_selector.cpp | 2 | ||||
| -rw-r--r-- | platform/android/export/export.cpp | 2 |
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++) { |