WinGui: Fix "(Any)" language track option on the Audio Tab for Automatic Selection...

diff --git a/win/CS/HandBrakeWPF/Constants.cs b/win/CS/HandBrakeWPF/Constants.cs
index c47bc8dc15519e11d07fe8e83433905b6b59aa03..49e0183c57defe29b3d85386b1f45e60a80ea372 100644 (file)
--- a/win/CS/HandBrakeWPF/Constants.cs
+++ b/win/CS/HandBrakeWPF/Constants.cs
@@ -39,6 +39,11 @@ namespace HandBrakeWPF
         /// </summary>\r
         public const string Any = "(Any)";\r
 \r
+        /// <summary>\r
+        /// Undefined Language\r
+        /// </summary>\r
+        public const string Undefined = "und";\r
+\r
         /// <summary>\r
         /// The chapters.\r
         /// </summary>\r

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