From f53c42fac932dabe87f1fdf00702a78b78b1e493 Mon Sep 17 00:00:00 2001
From: Jon Evans <jon@craftyjon.com>
Date: Mon, 20 May 2019 20:34:08 -0400
Subject: [PATCH] Fix another instance of wxGTK not liking menu icons

---
 common/tool/action_menu.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/common/tool/action_menu.cpp b/common/tool/action_menu.cpp
index a9af5e5d95..978041c292 100644
--- a/common/tool/action_menu.cpp
+++ b/common/tool/action_menu.cpp
@@ -70,6 +70,14 @@ static void set_wxMenuIcon( wxMenuItem* aMenu, const BITMAP_OPAQUE* aIcon )
     if( !Pgm().CommonSettings() )
         return;
 
+#if defined(__WXGTK__)
+
+    // wxGTK doesn't support this for non-normal menu items
+    if( aMenu->GetKind() != wxITEM_NORMAL )
+        return;
+
+#endif
+
     // Retrieve the global applicaton show icon option:
     bool useImagesInMenus;
     Pgm().CommonSettings()->Read( USE_ICONS_IN_MENUS_KEY, &useImagesInMenus );