From cdb411bb1455dd211dadd1e01286850ad36e03ef Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Mon, 10 Jan 2022 23:41:27 +0000 Subject: [PATCH] Fix issue with hotkeys getting overridden by non-running Kifaces. --- common/hotkey_store.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/common/hotkey_store.cpp b/common/hotkey_store.cpp index fb6a03a4c4..d262be5174 100644 --- a/common/hotkey_store.cpp +++ b/common/hotkey_store.cpp @@ -111,7 +111,9 @@ void HOTKEY_STORE::Init( std::vector aActionsList, bool aIncludeRe HOTKEY& hotkey = masterMap[ action->GetName() ]; hotkey.m_Actions.push_back( action ); - hotkey.m_EditKeycode = action->GetHotKey(); + + if( !hotkey.m_EditKeycode ) + hotkey.m_EditKeycode = action->GetHotKey(); } wxString currentApp;