use (new) safer GetTraitsIfExists() in wxMutexGuiEnter/Leave() to avoid crashing...

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

diff --git a/include/wx/app.h b/include/wx/app.h
index 5f4d622bae14cf5c74ec389c9730fbbba7e69a4c..ef542febc3825c17ff2b6910f23a325fc9c722cc 100644 (file)
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -198,6 +198,13 @@ public:
     // allows us to abstract the differences behind the common facade
     wxAppTraits *GetTraits();
 
     // allows us to abstract the differences behind the common facade
     wxAppTraits *GetTraits();
 

+    // this function provides safer access to traits object than
+    // wxTheApp->GetTraits() during startup or termination when the global
+    // application object itself may be unavailable
+    //
+    // of course, it still returns NULL in this case and the caller must check
+    // for it
+    static wxAppTraits *GetTraitsIfExists();

 
     // event processing functions
     // --------------------------
 
     // event processing functions
     // --------------------------

diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index 1efd57adddb6bd1cc567ed083c5a71241bc97e74..54cc271c41f14b70380730401a736a7a50eefec2 100644 (file)
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -290,6 +290,13 @@ wxAppTraits *wxAppConsoleBase::GetTraits()
     return m_traits;
 }
 
     return m_traits;
 }
 

+/* static */
+wxAppTraits *wxAppConsoleBase::GetTraitsIfExists()
+{
+    wxAppConsole * const app = GetInstance();
+    return app ? app->GetTraits() : NULL;
+}
+

 // ----------------------------------------------------------------------------
 // event processing
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // event processing
 // ----------------------------------------------------------------------------


@@ -673,12 +680,16 @@ void wxAppTraitsBase::MutexGuiLeave()
 
 void WXDLLIMPEXP_BASE wxMutexGuiEnter()
 {
 
 void WXDLLIMPEXP_BASE wxMutexGuiEnter()
 {

-    wxAppConsoleBase::GetInstance()->GetTraits()->MutexGuiEnter();
+    wxAppTraits * const traits = wxAppConsoleBase::GetTraitsIfExists();
+    if ( traits )
+        traits->MutexGuiEnter();

 }
 
 void WXDLLIMPEXP_BASE wxMutexGuiLeave()
 {
 }
 
 void WXDLLIMPEXP_BASE wxMutexGuiLeave()
 {

-    wxAppConsoleBase::GetInstance()->GetTraits()->MutexGuiLeave();
+    wxAppTraits * const traits = wxAppConsoleBase::GetTraitsIfExists();
+    if ( traits )
+        traits->MutexGuiLeave();

 }
 #endif // wxUSE_THREADS
 
 }
 #endif // wxUSE_THREADS