always initialize m_bChanged in wxConfigPathChanger ctor; this could result in diffic...

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

diff --git a/src/common/config.cpp b/src/common/config.cpp
index 22037a2cddc56c457e8c620458767955c2db7e3a..8e5572cf3947bdaa07eebfd6f1ab845d0341c5af 100644 (file)
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -225,8 +225,9 @@ bool wxConfigBase::DoWriteBool(const wxString& key, bool value)
 // ----------------------------------------------------------------------------
 
 wxConfigPathChanger::wxConfigPathChanger(const wxConfigBase *pContainer,
 // ----------------------------------------------------------------------------
 
 wxConfigPathChanger::wxConfigPathChanger(const wxConfigBase *pContainer,

-                                 const wxString& strEntry)
+                                         const wxString& strEntry)

 {
 {

+  m_bChanged = false;

   m_pContainer = (wxConfigBase *)pContainer;
 
   // the path is everything which precedes the last slash
   m_pContainer = (wxConfigBase *)pContainer;
 
   // the path is everything which precedes the last slash


@@ -243,7 +244,7 @@ wxConfigPathChanger::wxConfigPathChanger(const wxConfigBase *pContainer,
   {
     if ( m_pContainer->GetPath() != strPath )
     {
   {
     if ( m_pContainer->GetPath() != strPath )
     {

-        // do change the path
+        // we do change the path so restore it later

         m_bChanged = true;
 
         /* JACS: work around a memory bug that causes an assert
         m_bChanged = true;
 
         /* JACS: work around a memory bug that causes an assert


@@ -268,7 +269,6 @@ wxConfigPathChanger::wxConfigPathChanger(const wxConfigBase *pContainer,
   }
   else {
     // it's a name only, without path - nothing to do
   }
   else {
     // it's a name only, without path - nothing to do

-    m_bChanged = false;

     m_strName = strEntry;
   }
 }
     m_strName = strEntry;
   }
 }