From 2a673ff133f2f18060d0f376a809e12e930bae7c Mon Sep 17 00:00:00 2001 From: EricEzaM Date: Sat, 3 Apr 2021 22:11:29 +1000 Subject: [PATCH] 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 --- editor/settings_config_dialog.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/editor/settings_config_dialog.cpp b/editor/settings_config_dialog.cpp index 3852c389c7f..bdb90961eb7 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(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);