X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b11dd16306b272d16fa69721584cd1e57b524c5f..301e257baf3a227beb587749134bbc40786f761f:/src/common/config.cpp

diff --git a/src/common/config.cpp b/src/common/config.cpp
index 30ca1fa2e7..3248e1e59a 100644
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -39,9 +39,9 @@
 #include "wx/textfile.h"
 #include "wx/utils.h"
 #include "wx/utils.h"
+#include "wx/math.h"
 
 #include <stdlib.h>
-#include <math.h>
 #include <ctype.h>
 #include <limits.h>     // for INT_MAX
 
@@ -234,19 +234,31 @@ wxConfigPathChanger::wxConfigPathChanger(const wxConfigBase *pContainer,
   wxString strPath = strEntry.BeforeLast(wxCONFIG_PATH_SEPARATOR);
 
   // except in the special case of "/keyname" when there is nothing before "/"
-  if ( strPath.IsEmpty() &&
-       ((!strEntry.IsEmpty()) && strEntry[0] == wxCONFIG_PATH_SEPARATOR) )
+  if ( strPath.empty() &&
+       ((!strEntry.empty()) && strEntry[0] == wxCONFIG_PATH_SEPARATOR) )
   {
     strPath = wxCONFIG_PATH_SEPARATOR;
   }
 
-  if ( !strPath.IsEmpty() )
+  if ( !strPath.empty() )
   {
     if ( m_pContainer->GetPath() != strPath )
     {
         // do change the path
         m_bChanged = true;
-        m_strOldPath = m_pContainer->GetPath();
+
+        /* JACS: work around a memory bug that causes an assert
+           when using wxRegConfig, related to reference-counting.
+           Can be reproduced by removing (const wxChar*) below and
+           adding the following code to the config sample OnInit under
+           Windows:
+
+           pConfig->SetPath(wxT("MySettings"));
+           pConfig->SetPath(wxT(".."));
+           int value;
+           pConfig->Read(_T("MainWindowX"), & value);
+        */
+        m_strOldPath = (const wxChar*) m_pContainer->GetPath();
         if ( *m_strOldPath.c_str() != wxCONFIG_PATH_SEPARATOR )
           m_strOldPath += wxCONFIG_PATH_SEPARATOR;
         m_pContainer->SetPath(strPath);
@@ -421,7 +433,7 @@ void wxSplitPath(wxArrayString& aParts, const wxChar *sz)
 
         strCurrent.Empty();
       }
-      else if ( !strCurrent.IsEmpty() ) {
+      else if ( !strCurrent.empty() ) {
         aParts.push_back(strCurrent);
         strCurrent.Empty();
       }