From 18860312a42d941279c3b9b84b32775d8e80fddf Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 20 Oct 2004 15:00:22 +0000 Subject: [PATCH] fixed bug introduced by last commit: if we don't change the path because it is already correct, we should still change the name we use git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30035 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/config.cpp | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/common/config.cpp b/src/common/config.cpp index c75528c66e..4cc55702a7 100644 --- a/src/common/config.cpp +++ b/src/common/config.cpp @@ -240,15 +240,20 @@ wxConfigPathChanger::wxConfigPathChanger(const wxConfigBase *pContainer, strPath = wxCONFIG_PATH_SEPARATOR; } - if ( !strPath.IsEmpty() && m_pContainer->GetPath() != strPath ) { - // do change the path - m_bChanged = true; + if ( !strPath.IsEmpty() ) + { + if ( m_pContainer->GetPath() != strPath ) + { + // do change the path + m_bChanged = true; + m_strOldPath = m_pContainer->GetPath(); + if ( *m_strOldPath.c_str() != wxCONFIG_PATH_SEPARATOR ) + m_strOldPath += wxCONFIG_PATH_SEPARATOR; + m_pContainer->SetPath(strPath); + } + + // in any case, use the just the name, not full path m_strName = strEntry.AfterLast(wxCONFIG_PATH_SEPARATOR); - m_strOldPath = m_pContainer->GetPath(); - if ( m_strOldPath.Len() == 0 || - m_strOldPath.Last() != wxCONFIG_PATH_SEPARATOR ) - m_strOldPath += wxCONFIG_PATH_SEPARATOR; - m_pContainer->SetPath(strPath); } else { // it's a name only, without path - nothing to do -- 2.45.2