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

fixed handling of root paths: now checks if string ends with / before appending / to it

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-05-10 16:41:34 +00:00
parent b326e313a0
commit e9c4c02c19
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/config.cpp
View File

@@ -246,7 +246,9 @@ wxConfigPathChanger::wxConfigPathChanger(const wxConfigBase *pContainer,
m_bChanged = TRUE; m_bChanged = TRUE;
m_strName = strEntry.AfterLast(wxCONFIG_PATH_SEPARATOR); m_strName = strEntry.AfterLast(wxCONFIG_PATH_SEPARATOR);
m_strOldPath = m_pContainer->GetPath(); m_strOldPath = m_pContainer->GetPath();
m_strOldPath += wxCONFIG_PATH_SEPARATOR; if ( m_strOldPath.Len() == 0 ||
m_strOldPath.Last() != wxCONFIG_PATH_SEPARATOR )
m_strOldPath += wxCONFIG_PATH_SEPARATOR;
m_pContainer->SetPath(strPath); m_pContainer->SetPath(strPath);
} }
else { else {

6
src/msw/regconf.cpp
View File

@@ -221,7 +221,11 @@ void wxRegConfig::SetPath(const wxString& strPath)
{ {
strFullPath.reserve(2*m_strPath.length()); strFullPath.reserve(2*m_strPath.length());
strFullPath << m_strPath << wxCONFIG_PATH_SEPARATOR << strPath; strFullPath << m_strPath;
if ( strFullPath.Len() == 0 ||
strFullPath.Last() != wxCONFIG_PATH_SEPARATOR )
strFullPath << wxCONFIG_PATH_SEPARATOR;
strFullPath << strPath;
} }
// simplify it: we need to handle ".." here // simplify it: we need to handle ".." here