From 33f9843fb76f36439b7b75e3dba67d064238c505 Mon Sep 17 00:00:00 2001
From: Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
Date: Mon, 6 Jan 2020 14:45:07 +0100
Subject: [PATCH] ACTION_MANAGER: prevent null object call when used without a
 host frame

---
 common/tool/action_manager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/tool/action_manager.cpp b/common/tool/action_manager.cpp
index a529c1dc11..df85b9621c 100644
--- a/common/tool/action_manager.cpp
+++ b/common/tool/action_manager.cpp
@@ -200,7 +200,7 @@ void ACTION_MANAGER::UpdateHotKeys( bool aFullUpdate )
     m_actionHotKeys.clear();
     m_hotkeys.clear();
 
-    if( aFullUpdate )
+    if( aFullUpdate && m_toolMgr->GetEditFrame() )
     {
         ReadLegacyHotkeyConfig( m_toolMgr->GetEditFrame()->ConfigBaseName(), legacyHotKeyMap );
         ReadHotKeyConfig( wxEmptyString, userHotKeyMap );