From cd5b1c28853171b48dfe7c650ab9b61bbf46723f Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Tue, 18 Sep 2018 11:59:24 +0200
Subject: [PATCH] set_wxMenuIcon: prevent null pointer dereference

---
 common/tool/context_menu.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/common/tool/context_menu.cpp b/common/tool/context_menu.cpp
index 1c0e5c88b1..fb237486da 100644
--- a/common/tool/context_menu.cpp
+++ b/common/tool/context_menu.cpp
@@ -60,6 +60,9 @@ CONTEXT_MENU::~CONTEXT_MENU()
  */
 static void set_wxMenuIcon( wxMenuItem* aMenu, const BITMAP_OPAQUE* aIcon )
 {
+    if( !Pgm().CommonSettings() )
+        return;
+
     // Retrieve the global applicaton show icon option:
     bool useImagesInMenus;
     Pgm().CommonSettings()->Read( USE_ICONS_IN_MENUS_KEY, &useImagesInMenus );