don't crash in GetInstallPrefix() if wxTheApp == NULL (especially as we don't need...

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

diff --git a/src/unix/stdpaths.cpp b/src/unix/stdpaths.cpp
index fc50fe8ae5178f6d9aaa38f9acacbc6295720dd3..780f683d137bd20b9af8929b2678b2239be31905 100644 (file)
--- a/src/unix/stdpaths.cpp
+++ b/src/unix/stdpaths.cpp
@@ -70,11 +70,10 @@ wxString wxStandardPaths::GetInstallPrefix() const
         {
             buf[result] = '\0'; // readlink() doesn't NUL-terminate the buffer
 
         {
             buf[result] = '\0'; // readlink() doesn't NUL-terminate the buffer
 

-            wxString exeStr(buf, wxConvLibc);
+            const wxString exeStr(buf, wxConvLibc);

 
             // consider that we're in the last "bin" subdirectory of our prefix
 
             // consider that we're in the last "bin" subdirectory of our prefix

-            wxString basename(wxString(wxTheApp->argv[0]).AfterLast(_T('/')));
-            size_t pos = exeStr.find(wxT("/bin/") + basename);
+            size_t pos = exeStr.rfind(wxT("/bin/"));

             if ( pos != wxString::npos )
                 pathPtr->m_prefix.assign(exeStr, 0, pos);
         }
             if ( pos != wxString::npos )
                 pathPtr->m_prefix.assign(exeStr, 0, pos);
         }