diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp index a4b965bcbf..f5598a3c9f 100644 --- a/src/mac/carbon/toplevel.cpp +++ b/src/mac/carbon/toplevel.cpp @@ -421,6 +421,8 @@ DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacWindowEventHandler ) wxList *wxWinMacWindowList = NULL; wxTopLevelWindowMac *wxFindWinFromMacWindow(WXWindow inWindowRef) { + if ( wxWinMacWindowList == NULL ) + return NULL ; wxNode *node = wxWinMacWindowList->Find((long)inWindowRef); if (!node) return NULL; diff --git a/src/mac/toplevel.cpp b/src/mac/toplevel.cpp index a4b965bcbf..f5598a3c9f 100644 --- a/src/mac/toplevel.cpp +++ b/src/mac/toplevel.cpp @@ -421,6 +421,8 @@ DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacWindowEventHandler ) wxList *wxWinMacWindowList = NULL; wxTopLevelWindowMac *wxFindWinFromMacWindow(WXWindow inWindowRef) { + if ( wxWinMacWindowList == NULL ) + return NULL ; wxNode *node = wxWinMacWindowList->Find((long)inWindowRef); if (!node) return NULL;