]> granicus.if.org Git - handbrake/commitdiff
MacGui: fix the audio defaults to use the languages specified in the preferences.
authorritsuka <damiog@gmail.com>
Mon, 1 Jun 2015 17:23:11 +0000 (17:23 +0000)
committerritsuka <damiog@gmail.com>
Mon, 1 Jun 2015 17:23:11 +0000 (17:23 +0000)
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7258 b64f7644-9d1e-0410-96f1-a4d463321fa5

macosx/HBAudioDefaults.m

index acff4ceaa74b8c1e4f6d3ba14ed7c9a641f199ee..f54bb8e77ba7e6608c828c36bd4cf70d286d4a55 100644 (file)
     if ([preset[@"Type"] intValue] == 0)
     {
         self.trackSelectionBehavior = HBAudioTrackSelectionBehaviorFirst;
-        if (self.trackSelectionLanguages.count == 0)
+        if (self.trackSelectionLanguages.count == 0 || [self.trackSelectionLanguages.firstObject isEqualToString:@"und"])
         {
-            if ([[NSUserDefaults standardUserDefaults] stringForKey:@"DefaultLanguage"])
+            if ([[NSUserDefaults standardUserDefaults] stringForKey:@"AlternateLanguage"])
             {
-                NSString *lang = [self isoCodeForNativeLang:[[NSUserDefaults standardUserDefaults] stringForKey:@"DefaultLanguage"]];
+                NSString *lang = [self isoCodeForNativeLang:[[NSUserDefaults standardUserDefaults] stringForKey:@"AlternateLanguage"]];
                 if (lang)
                 {
-                    [self.trackSelectionLanguages addObject:lang];
+                    [self.trackSelectionLanguages insertObject:lang atIndex:0];
                 }
             }
-            if ([[NSUserDefaults standardUserDefaults] stringForKey:@"AlternateLanguage"])
+            if ([[NSUserDefaults standardUserDefaults] stringForKey:@"DefaultLanguage"])
             {
-                NSString *lang = [self isoCodeForNativeLang:[[NSUserDefaults standardUserDefaults] stringForKey:@"AlternateLanguage"]];
+                NSString *lang = [self isoCodeForNativeLang:[[NSUserDefaults standardUserDefaults] stringForKey:@"DefaultLanguage"]];
                 if (lang)
                 {
-                    [self.trackSelectionLanguages addObject:lang];
+                    [self.trackSelectionLanguages insertObject:lang atIndex:0];
                 }
             }
         }