don't crash in Get() if there is no wxApp (closes 1236514)

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

diff --git a/src/common/stdpbase.cpp b/src/common/stdpbase.cpp
index 5c104c2fe929238982aa18854bc72d439e1c145d..6f9bba7c978ced79ea4c8fcc073a77c3534bbe58 100644 (file)
--- a/src/common/stdpbase.cpp
+++ b/src/common/stdpbase.cpp
@@ -47,7 +47,10 @@ static wxStandardPaths gs_stdPaths;
 /* static */
 wxStandardPathsBase& wxStandardPathsBase::Get()
 {
 /* static */
 wxStandardPathsBase& wxStandardPathsBase::Get()
 {

-    return wxTheApp->GetTraits()->GetStandardPaths();
+    wxAppTraits * const traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
+    wxCHECK_MSG( traits, gs_stdPaths, _T("create wxApp before calling this") );
+
+    return traits->GetStandardPaths();

 }
 
 wxStandardPathsBase& wxAppTraitsBase::GetStandardPaths()
 }
 
 wxStandardPathsBase& wxAppTraitsBase::GetStandardPaths()