Fix issue with hotkeys getting overridden by non-running Kifaces.
This commit is contained in:
parent
dcab2833b8
commit
cdb411bb14
|
@ -111,7 +111,9 @@ void HOTKEY_STORE::Init( std::vector<TOOL_ACTION*> aActionsList, bool aIncludeRe
|
||||||
|
|
||||||
HOTKEY& hotkey = masterMap[ action->GetName() ];
|
HOTKEY& hotkey = masterMap[ action->GetName() ];
|
||||||
hotkey.m_Actions.push_back( action );
|
hotkey.m_Actions.push_back( action );
|
||||||
hotkey.m_EditKeycode = action->GetHotKey();
|
|
||||||
|
if( !hotkey.m_EditKeycode )
|
||||||
|
hotkey.m_EditKeycode = action->GetHotKey();
|
||||||
}
|
}
|
||||||
|
|
||||||
wxString currentApp;
|
wxString currentApp;
|
||||||
|
|
Loading…
Reference in New Issue