commit 5a220321dfd96ded46ee95d9ae971f552ba5ffe0
author Ken Thomases <ken@codeweavers.com> Mon Jan 08 22:28:07 2007 -0600
committer Alexandre Julliard <julliard@winehq.org> Tue Jan 09 12:04:30 2007 +0100
tree cbef399938d9c0b2e40da4ff182d1827720ab551
parent 22684cc767825299a151eb9f6cb26a366510a496

kernel32: Don't release preferred_locales until we're done with its members.

dlls/kernel32/locale.c

diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c
index fcb8f18..845234d 100644
--- a/dlls/kernel32/locale.c
+++ b/dlls/kernel32/locale.c
@@ -2842,12 +2842,8 @@
     */
     all_locales = CFLocaleCopyAvailableLocaleIdentifiers();
     preferred_locales = CFBundleCopyLocalizationsForPreferences( all_locales, NULL );
-    if (preferred_locales)
-    {
-        if (CFArrayGetCount( preferred_locales ))
-            user_language_string_ref = CFArrayGetValueAtIndex( preferred_locales, 0 );
-        CFRelease( preferred_locales );
-    }
+    if (preferred_locales && CFArrayGetCount( preferred_locales ))
+        user_language_string_ref = CFArrayGetValueAtIndex( preferred_locales, 0 );
     CFRelease( all_locales );
 #endif /* __APPLE__ */
 
@@ -2868,6 +2864,8 @@
         lcid_LC_MESSAGES = locale_name.lcid;
         TRACE( "setting lcid_LC_MESSAGES to '%s'\n", user_locale );
     }
+    if (preferred_locales)
+        CFRelease( preferred_locales );
 #endif
 
     NtSetDefaultUILanguage( LANGIDFROMLCID(lcid_LC_MESSAGES) );