From: Václav Slavík <vslavik@fastmail.fm>
Date: Thu, 10 May 2001 16:41:34 +0000 (+0000)
Subject: fixed handling of root paths: now checks if string ends with / before appending ... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e9c4c02c19c11e6cd487e03e0a7b105d0281fd7e

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


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

diff --git a/src/common/config.cpp b/src/common/config.cpp
index feccd99ab0..be417c4243 100644
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -246,7 +246,9 @@ wxConfigPathChanger::wxConfigPathChanger(const wxConfigBase *pContainer,
     m_bChanged = TRUE;
     m_strName = strEntry.AfterLast(wxCONFIG_PATH_SEPARATOR);
     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);
   }
   else {
diff --git a/src/msw/regconf.cpp b/src/msw/regconf.cpp
index 4b9844cfbf..fefb7b86c9 100644
--- a/src/msw/regconf.cpp
+++ b/src/msw/regconf.cpp
@@ -221,7 +221,11 @@ void wxRegConfig::SetPath(const wxString& strPath)
         {
             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