diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-04-10 11:04:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-10 11:04:50 +0200 |
| commit | d3c492b7d4a38c3a68d52e9224d432bd1e05660a (patch) | |
| tree | 8593459534ad6d031efe6dd98960d6dfe8c17272 /editor | |
| parent | 81fc9fa1dc9162cb50e77ab5f7d7085eb3c4bc9e (diff) | |
| parent | 2a673ff133f2f18060d0f376a809e12e930bae7c (diff) | |
Merge pull request #47596 from EricEzaM/PR/fix-editor-settings-shortcuts-wrong-button-action
Fixed Editor Shortcuts revert/edit/clear buttons performing the wrong action
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/settings_config_dialog.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/editor/settings_config_dialog.cpp b/editor/settings_config_dialog.cpp index 3be2136a20..81af4996ed 100644 --- a/editor/settings_config_dialog.cpp +++ b/editor/settings_config_dialog.cpp @@ -393,9 +393,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); |