From 9da04d8374714fe588502a78e69a7797c27cee06 Mon Sep 17 00:00:00 2001 From: Eric M Date: Sat, 21 Jan 2023 16:40:03 +1000 Subject: Fix shortcuts which have feature override defined reverting to default when user changes the shortcut to be same as non-overriden. --- editor/editor_settings.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp index 8ca98e6f76..dc6b64ddc1 100644 --- a/editor/editor_settings.cpp +++ b/editor/editor_settings.cpp @@ -1485,11 +1485,11 @@ void ED_SHORTCUT_OVERRIDE_ARRAY(const String &p_path, const String &p_feature, c } // Override the existing shortcut only if it wasn't customized by the user (i.e. still "original"). + sc->set_meta("original", events.duplicate(true)); + if (Shortcut::is_event_array_equal(sc->get_events(), sc->get_meta("original"))) { sc->set_events(events); } - - sc->set_meta("original", events.duplicate(true)); } Ref ED_SHORTCUT(const String &p_path, const String &p_name, Key p_keycode) { -- cgit v1.2.3