From 890976b89fe8d308c048f52e1ca0df287c8259a6 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Mon, 4 Oct 2004 19:28:13 +0000 Subject: [PATCH] Bail out if GetCurrentMenu returns NULL git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/taskbar.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/mac/carbon/taskbar.cpp b/src/mac/carbon/taskbar.cpp index 395f5f5e30..62b912bbe8 100644 --- a/src/mac/carbon/taskbar.cpp +++ b/src/mac/carbon/taskbar.cpp @@ -36,7 +36,12 @@ pascal OSStatus wxDockEventHandler( EventHandlerCallRef inHandlerCallRef, { //TODO: This is a complete copy of //static pascal OSStatus wxMacAppCommandEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) - + + if (! pTB->GetCurrentMenu() ) + { + return eventNotHandledErr; + } + MenuRef hMenu = MAC_WXHMENU(pTB->GetCurrentMenu()->GetHMenu()); OSStatus result = eventNotHandledErr ; -- 2.47.2