summaryrefslogtreecommitdiff
path: root/editor
diff options
context:
space:
mode:
authorEricEzaM <itsjusteza@gmail.com>2021-04-03 22:11:29 +1000
committerEricEzaM <itsjusteza@gmail.com>2021-04-03 22:11:29 +1000
commit2a673ff133f2f18060d0f376a809e12e930bae7c (patch)
tree393dd451f9185988f90cc0c5e1825e2bab955461 /editor
parented2f51b15fee22a35d2a975fd77a70fc291bd8de (diff)
Fixed Editor Shortcuts revert/edit/clear buttons performing the wrong action.
For shortcuts not in the 'Common' section, the wrong action was being executed. Fixes part of #47594
Diffstat (limited to 'editor')
-rw-r--r--editor/settings_config_dialog.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/editor/settings_config_dialog.cpp b/editor/settings_config_dialog.cpp
index 3852c389c7..bdb90961eb 100644
--- a/editor/settings_config_dialog.cpp
+++ b/editor/settings_config_dialog.cpp
@@ -391,9 +391,10 @@ void EditorSettingsDialog::_shortcut_button_pressed(Object *p_item, int p_column
TreeItem *ti = Object::cast_to<TreeItem>(p_item);
ERR_FAIL_COND(!ti);
+ button_idx = p_idx;
+
if (ti->get_metadata(0) == "Common") {
// Editing a Built-in action, which can have multiple bindings.
- button_idx = p_idx;
editing_action = true;
current_action = ti->get_text(0);