godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #32406 from YeldhamDev/fix_action_move_crash 

Fix crash when moving an action into itself in the Input Map editor
This commit is contained in:
Rémi Verschelde 2019-09-28 07:47:14 +02:00 committed by GitHub
parent e636563d5d 4e9df13a40
commit e128c2c338
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/project_settings_editor.cpp
View File

@ -1078,7 +1078,7 @@ bool ProjectSettingsEditor::can_drop_data_fw(const Point2 &p_point, const Varian
TreeItem *selected = input_editor->get_selected(); TreeItem *selected = input_editor->get_selected();
TreeItem *item = input_editor->get_item_at_position(p_point); 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 false;
return true; return true;