WinGui: Fix "(Any)" language track option on the Audio Tab for Automa…

…tic Selection Behaviours
HandBrake · Dec 26, 2016 · 5b8ac22 · 5b8ac22
1 parent d1376ab
commit 5b8ac22
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/win/CS/HandBrakeWPF/Constants.cs b/win/CS/HandBrakeWPF/Constants.cs
@@ -39,6 +39,11 @@ public class Constants
         /// </summary>
         public const string Any = "(Any)";
 
+        /// <summary>
+        /// Undefined Language
+        /// </summary>
+        public const string Undefined = "und";
+
         /// <summary>
         /// The chapters.
         /// </summary>

diff --git a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
@@ -418,7 +418,7 @@ private void SetupTracks()
         /// </summary>
         private void AddFirstForSelectedLanguages()
         {
-            foreach (Audio sourceTrack in this.GetSelectedLanguagesTracks(false))
+            foreach (Audio sourceTrack in this.GetSelectedLanguagesTracks())
             {
                 // Step 2: Check if the track list already contrains this track
                 bool found = this.Task.AudioTracks.Any(audioTrack => Equals(audioTrack.ScannedTrack, sourceTrack));
@@ -448,7 +448,7 @@ private void AddFirstForSelectedLanguages()
         public void AddAllRemainingForSelectedLanguages()
         {
             // Add them if they are not already added.
-            foreach (Audio sourceTrack in this.GetSelectedLanguagesTracks(false))
+            foreach (Audio sourceTrack in this.GetSelectedLanguagesTracks())
             {
                 // Step 2: Check if the track list already contrains this track
                 bool found = this.Task.AudioTracks.Any(audioTrack => Equals(audioTrack.ScannedTrack, sourceTrack));
@@ -486,19 +486,16 @@ private Audio GetPreferredAudioTrack()
         /// <summary>
         /// Gets a list of source tracks for the users selected languages.
         /// </summary>
-        /// <param name="includeAny">
-        /// The include Any.
-        /// </param>
         /// <returns>
         /// A list of source audio tracks.
         /// </returns>
-        private IEnumerable<Audio> GetSelectedLanguagesTracks(bool includeAny)
+        private IEnumerable<Audio> GetSelectedLanguagesTracks()
         {
             List<Audio> trackList = new List<Audio>();
 
             List<string> isoCodes = LanguageUtilities.GetLanguageCodes(this.AudioBehaviours.SelectedLangauges.ToArray());
 
-            if (includeAny)
+            if (isoCodes.Contains(Constants.Undefined))
             {
                 isoCodes = LanguageUtilities.GetIsoCodes();
             }