don't crash when loading images with verbose==false (patch 1449823)

[wxWidgets.git] / src / common / config.cpp

diff --git a/src/common/config.cpp b/src/common/config.cpp
index 22037a2cddc56c457e8c620458767955c2db7e3a..62013b23e4cf72010a1ec3bd7bfb744be7d8ffe1 100644 (file)
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -33,8 +33,6 @@
 
 #include "wx/app.h"
 #include "wx/file.h"
 
 #include "wx/app.h"
 #include "wx/file.h"

-#include "wx/textfile.h"
-#include "wx/utils.h"

 #include "wx/utils.h"
 #include "wx/math.h"
 
 #include "wx/utils.h"
 #include "wx/math.h"
 


@@ -225,8 +223,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 +242,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 +267,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;
   }
 }