From b7b00ae1724d46df3c6f6f7f38b6d9a67f84c01c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 16 Nov 2007 23:41:38 +0000 Subject: [PATCH] reset global wxTheApp pointer before deleting it to avoid use of half-destroyed object (bug 1831130) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50009 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/init.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/common/init.cpp b/src/common/init.cpp index 639a614add..ee24148576 100644 --- 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; } -- 2.45.2