Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38366 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-03-25 14:34:27 +00:00
parent 5cf83b1ac0
commit 300ff33dec
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/unix/stdpaths.cpp
View File

@@ -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.rfind(wxT("/bin/"));
size_t pos = exeStr.find(wxT("/bin/") + basename);
if ( pos != wxString::npos ) if ( pos != wxString::npos )
pathPtr->m_prefix.assign(exeStr, 0, pos); pathPtr->m_prefix.assign(exeStr, 0, pos);
} }