Initial revision

[wxWidgets.git] / src / msw / regconf.cpp

diff --git a/src/msw/regconf.cpp b/src/msw/regconf.cpp
index 4fb34f240d9a1ff3030e7de0b44b4c3662b4bc8e..e62511ca68015e8ed19a3e509b696af4a3a0290a 100644 (file)
--- a/src/msw/regconf.cpp
+++ b/src/msw/regconf.cpp
@@ -160,13 +160,25 @@ void wxRegConfig::SetPath(const wxString& strPath)
   }
 
   // recombine path parts in one variable
   }
 
   // recombine path parts in one variable

-  wxString strRegPath;
+  wxString strOldPath = m_strPath, strRegPath;

   m_strPath.Empty();
   for ( size_t n = 0; n < aParts.Count(); n++ ) {
     strRegPath << '\\' << aParts[n];
     m_strPath << wxCONFIG_PATH_SEPARATOR << aParts[n];
   }
 
   m_strPath.Empty();
   for ( size_t n = 0; n < aParts.Count(); n++ ) {
     strRegPath << '\\' << aParts[n];
     m_strPath << wxCONFIG_PATH_SEPARATOR << aParts[n];
   }
 

+  if ( m_strPath == strOldPath )
+      return;
+
+  // as we create the registry key when SetPath(key) is done, we can be left
+  // with plenty of empty keys if this was only done to try to read some value
+  // which, in fact, doesn't exist - to prevent this from happening we
+  // automatically delete the old key if it was empty
+  if ( m_keyLocal.IsEmpty() )
+  {
+      m_keyLocal.DeleteSelf();
+  }
+

   // change current key(s)
   m_keyLocal.SetName(m_keyLocalRoot, strRegPath);
   m_keyGlobal.SetName(m_keyGlobalRoot, strRegPath);
   // change current key(s)
   m_keyLocal.SetName(m_keyLocalRoot, strRegPath);
   m_keyGlobal.SetName(m_keyGlobalRoot, strRegPath);