don't crash on weird line endings like \r\r\n

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

diff --git a/src/common/config.cpp b/src/common/config.cpp
index 19885d4a39275cc9445b2c340946a49f279db263..4b509a7fc0d8a41eaf22e3538e171d801b7ad8fc 100644 (file)
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -32,12 +32,12 @@
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/arrstr.h"
+    #include "wx/math.h"
 #endif //WX_PRECOMP
 
 #if wxUSE_CONFIG && ((wxUSE_FILE && wxUSE_TEXTFILE) || wxUSE_CONFIG_NATIVE)
 
 #include "wx/file.h"
-#include "wx/math.h"
 
 #include <stdlib.h>
 #include <ctype.h>
@@ -274,6 +274,21 @@ wxConfigPathChanger::wxConfigPathChanger(const wxConfigBase *pContainer,
   }
 }
 
+void wxConfigPathChanger::UpdateIfDeleted()
+{
+    // we don't have to do anything at all if we didn't change the path
+    if ( !m_bChanged )
+        return;
+
+    // find the deepest still existing parent path of the original path
+    while ( !m_pContainer->HasGroup(m_strOldPath) )
+    {
+        m_strOldPath = m_strOldPath.BeforeLast(wxCONFIG_PATH_SEPARATOR);
+        if ( m_strOldPath.empty() )
+            m_strOldPath = wxCONFIG_PATH_SEPARATOR;
+    }
+}
+
 wxConfigPathChanger::~wxConfigPathChanger()
 {
   // only restore path if it was changed