From a8af0c27af923a4db1254897d5d759c421ad79bb Mon Sep 17 00:00:00 2001
From: Ian McInerney <Ian.S.McInerney@ieee.org>
Date: Sun, 4 Aug 2019 21:44:42 +0200
Subject: [PATCH] Add validity check before doing accelerator key creation

---
 src/gtk/menu.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index 3445ced6ca..bc121ecf3c 100644
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -665,7 +665,7 @@ void wxMenuItem::SetGtkLabel()
     guint accel_key;
     GdkModifierType accel_mods;
     wxGetGtkAccel(this, &accel_key, &accel_mods);
-    if (accel_key)
+    if ( accel_key && gtk_accelerator_valid( accel_key, accel_mods ) )
     {
         gtk_widget_add_accelerator(
             m_menuItem, "activate", GetRootParentMenu(m_parentMenu)->m_accel,
@@ -673,7 +673,7 @@ void wxMenuItem::SetGtkLabel()
     }
     else
     {
-        // Remove the accelerator since it couldn't be made
+        // Remove the accelerator since it couldn't be made or is invalid
         m_text = m_text.BeforeFirst( wxT( '\t' ) );
     }
 #endif // wxUSE_ACCEL