reset global wxTheApp pointer before deleting it to avoid use of half-destroyed objec...

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

diff --git a/src/common/init.cpp b/src/common/init.cpp
index 639a614addebac7e86e3ae3416dab64cc9ede133..ee24148576eaafe9038f29b86facb634f30d2cc1 100644 (file)
--- a/src/common/init.cpp
+++ b/src/common/init.cpp
@@ -394,8 +394,12 @@ void wxEntryCleanup()
     {
         wxTheApp->CleanUp();
 
-        delete wxTheApp;
+        // reset the global pointer to it to NULL before destroying it as in
+        // some circumstances this can result in executing the code using
+        // wxTheApp and using half-destroyed object is no good
+        wxAppConsole * const app = wxApp::GetInstance();
         wxApp::SetInstance(NULL);
+        delete app;
     }