Bail out if GetCurrentMenu returns NULL

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/taskbar.cpp b/src/mac/carbon/taskbar.cpp
index 395f5f5e30fc1723250731a41c8f43a59e83f86a..62b912bbe86d3b75826cbe0e1b0ed34aa992e288 100644 (file)
--- 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 )
     {
         //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 ;
 
         MenuRef hMenu = MAC_WXHMENU(pTB->GetCurrentMenu()->GetHMenu());
         OSStatus result = eventNotHandledErr ;