After delete wxPendingEventsLocker; wxPendingEventsLocker = NULL; so that

the wxEvent code doesn't try to use it while cleaning up.

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

diff --git a/src/mac/app.cpp b/src/mac/app.cpp
index aab9d2758084a8ed2c7ce3a462c2fc8448641469..0e4ce104f2799e6b90d71f48facb49f8ba04a5a7 100644 (file)
--- a/src/mac/app.cpp
+++ b/src/mac/app.cpp
@@ -670,6 +670,8 @@ void wxApp::CleanUp()
 
 #if wxUSE_THREADS
     delete wxPendingEventsLocker;
+    // There is still more cleanup code that will try to use this if not NULL.
+    wxPendingEventsLocker = NULL;
     // If we don't do the following, we get an apparent memory leak.
     ((wxEvtHandler&) wxDefaultValidator).ClearEventLocker();
 #endif

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index aab9d2758084a8ed2c7ce3a462c2fc8448641469..0e4ce104f2799e6b90d71f48facb49f8ba04a5a7 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -670,6 +670,8 @@ void wxApp::CleanUp()
 
 #if wxUSE_THREADS
     delete wxPendingEventsLocker;
+    // There is still more cleanup code that will try to use this if not NULL.
+    wxPendingEventsLocker = NULL;
     // If we don't do the following, we get an apparent memory leak.
     ((wxEvtHandler&) wxDefaultValidator).ClearEventLocker();
 #endif