Test m_nowpeer pointer before using it.

[wxWidgets.git] / src / unix / stdpaths.cpp

diff --git a/src/unix/stdpaths.cpp b/src/unix/stdpaths.cpp
index c127fc3d665611b43b1fd5b83b959b467a14dec4..64ac00cc22456b5f72e946dde490b562161aa105 100644 (file)
--- a/src/unix/stdpaths.cpp
+++ b/src/unix/stdpaths.cpp
@@ -29,6 +29,7 @@
 #include "wx/stdpaths.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/app.h"
     #include "wx/wxcrt.h"
     #include "wx/utils.h"
 #endif //WX_PRECOMP
@@ -196,7 +197,11 @@ wxString wxStandardPaths::GetDataDir() const
     // practice for running well-written (and so using wxStandardPaths to find
     // their files) wx applications without installing them
     static const wxString
-      envOverride(getenv("WX_" + wxTheApp->GetAppName().Upper() + "_DATA_DIR"));
+      envOverride(
+        getenv(
+            ("WX_" + wxTheApp->GetAppName().Upper() + "_DATA_DIR").c_str()
+        )
+      );
 
     if ( !envOverride.empty() )
         return envOverride;