From d6fb362bd152d64e0efea097a39c0cd14c27b7f1 Mon Sep 17 00:00:00 2001
From: Jon Evans <jon@craftyjon.com>
Date: Sun, 11 Feb 2024 12:00:42 -0500
Subject: [PATCH] Add attempted fix for Sonoma menu crashes

See https://gitlab.com/kicad/code/kicad/-/issues/16844#note_1767141019
---
 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 b1625f0afd..a70aeac709 100644
--- a/common/tool/action_menu.cpp
+++ b/common/tool/action_menu.cpp
@@ -402,6 +402,14 @@ void ACTION_MENU::OnIdle( wxIdleEvent& event )
 
 void ACTION_MENU::OnMenuEvent( wxMenuEvent& aEvent )
 {
+#ifdef __WXOSX__
+    if( aEvent.GetMenu() != this )
+    {
+        aEvent.Skip();
+        return;
+    }
+#endif
+
     OPT_TOOL_EVENT evt;
     wxString       menuText;
     wxEventType    type    = aEvent.GetEventType();