summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2019-09-28 07:47:14 +0200
committerGitHub <noreply@github.com>2019-09-28 07:47:14 +0200
commite128c2c33855db4ee5ed68683aef45aed4177420 (patch)
treeb7887f90622f787f0df61f9d9acacd162e8c5afc
parente636563d5df45c0929618cad2c267d1a123f84e6 (diff)
parent4e9df13a40da874d96949f4c274cf8121e33e909 (diff)
Merge pull request #32406 from YeldhamDev/fix_action_move_crash
Fix crash when moving an action into itself in the Input Map editor
-rw-r--r--editor/project_settings_editor.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/editor/project_settings_editor.cpp b/editor/project_settings_editor.cpp
index d42f15cce8..a56cfede34 100644
--- a/editor/project_settings_editor.cpp
+++ b/editor/project_settings_editor.cpp
@@ -1078,7 +1078,7 @@ bool ProjectSettingsEditor::can_drop_data_fw(const Point2 &p_point, const Varian
TreeItem *selected = input_editor->get_selected();
TreeItem *item = input_editor->get_item_at_position(p_point);
- if (!selected || !item || item->get_parent() == selected)
+ if (!selected || !item || item == selected || item->get_parent() == selected)
return false;
return true;