]> git.saurik.com Git - wxWidgets.git/commitdiff
Reset wxTheApp when starting to destroy the object it points to.
authorVadim Zeitlin <vadim@wxwidgets.org>
Mon, 7 Dec 2009 17:03:25 +0000 (17:03 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Mon, 7 Dec 2009 17:03:25 +0000 (17:03 +0000)
Using wxTheApp when the corresponding object is already half destroyed can't
be a good idea so reset it to NULL as soon as possible.

Closes #11525.

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

src/common/appbase.cpp

index c8ec12a388bfaa0a50038e86d6a6284032dbce58..f2bed9aca81dc2336602f5fe32fed92659826434 100644 (file)
@@ -154,6 +154,10 @@ wxAppConsoleBase::wxAppConsoleBase()
 
 wxAppConsoleBase::~wxAppConsoleBase()
 {
+    // we're being destroyed and using this object from now on may not work or
+    // even crash so don't leave dangling pointers to it
+    ms_appInstance = NULL;
+
     delete m_traits;
 }