ACTION_MANAGER: prevent null object call when used without a host frame
This commit is contained in:
parent
065d634b30
commit
33f9843fb7
|
@ -200,7 +200,7 @@ void ACTION_MANAGER::UpdateHotKeys( bool aFullUpdate )
|
||||||
m_actionHotKeys.clear();
|
m_actionHotKeys.clear();
|
||||||
m_hotkeys.clear();
|
m_hotkeys.clear();
|
||||||
|
|
||||||
if( aFullUpdate )
|
if( aFullUpdate && m_toolMgr->GetEditFrame() )
|
||||||
{
|
{
|
||||||
ReadLegacyHotkeyConfig( m_toolMgr->GetEditFrame()->ConfigBaseName(), legacyHotKeyMap );
|
ReadLegacyHotkeyConfig( m_toolMgr->GetEditFrame()->ConfigBaseName(), legacyHotKeyMap );
|
||||||
ReadHotKeyConfig( wxEmptyString, userHotKeyMap );
|
ReadHotKeyConfig( wxEmptyString, userHotKeyMap );
|
||||||
|
|
Loading…
Reference in New Issue