2nd part of wxRegConfig fix

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

diff --git a/src/msw/regconf.cpp b/src/msw/regconf.cpp
index 9853728ea5af1bbc822f70d899df5f10b548d710..362646e337f78aaa864a47b1e92505c93086b72b 100644 (file)
--- a/src/msw/regconf.cpp
+++ b/src/msw/regconf.cpp
@@ -248,13 +248,15 @@ bool wxRegConfig::GetNextEntry(wxString& str, long& lIndex) const
   // are we already enumerating local entries?
   if ( m_keyGlobal.IsOpened() && !IS_LOCAL_INDEX(lIndex) ) {
     // try to find a global entry which doesn't appear locally
   // are we already enumerating local entries?
   if ( m_keyGlobal.IsOpened() && !IS_LOCAL_INDEX(lIndex) ) {
     // try to find a global entry which doesn't appear locally

-    do {
-      if ( !m_keyGlobal.GetNextValue(str, lIndex) ) {
-        // no more global entries
-        lIndex |= LOCAL_MASK;
-        break;
+    while ( m_keyGlobal.GetNextValue(str, lIndex) ) {
+      if ( !m_keyLocal.HasValue(str) ) {
+        // ok, found one - return it
+        return TRUE;

       }
       }

-    } while( m_keyLocal.HasValue(str) );
+    }
+
+    // no more global entries
+    lIndex |= LOCAL_MASK;

   }
 
   // much easier with local entries: get the next one we find
   }
 
   // much easier with local entries: get the next one we find