From 300ff33dec4eab9d4b8aac72558d8ba8ec4923c1 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 25 Mar 2006 14:34:27 +0000 Subject: [PATCH] don't crash in GetInstallPrefix() if wxTheApp == NULL (especially as we don't need it anyhow) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38366 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/unix/stdpaths.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/unix/stdpaths.cpp b/src/unix/stdpaths.cpp index fc50fe8ae5..780f683d13 100644 --- 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 - wxString exeStr(buf, wxConvLibc); + const wxString exeStr(buf, wxConvLibc); // 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); } -- 2.45.2