instead of language name, use language code for prefered audio and prefered subtitle...

diff --git a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
index 771267e26002ad3cb4d2ec7936ef7f09192265b6..83f509269f1b1624f66b3e61b13ff755e75aacc5 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
@@ -495,9 +495,10 @@ namespace HandBrakeWPF.ViewModels
             if (this.AudioBehaviours.SelectedLangauges.Count > 0)\r
             {\r
                 string langName = this.AudioBehaviours.SelectedLangauges.FirstOrDefault(w => !w.Equals(Constants.Any));\r
-                if (!string.IsNullOrEmpty(langName))\r
+                string langCode = LanguageUtilities.GetLanguageCode(langName);\r
+                if (!string.IsNullOrEmpty(langCode))\r
                 {\r
-                    preferredAudioTracks = this.SourceTracks.Where(item => item.Language.Contains(langName));\r
+                    preferredAudioTracks = this.SourceTracks.Where(item => item.LanguageCode.Contains(langCode));\r
                 }\r
             }\r
 \r

diff --git a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
index f1191edae832fcbf01067f24e88e0810eaa8aac1..d747c61120af8b72587a0b5aec1809cee6883b39 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
@@ -602,7 +602,9 @@ namespace HandBrakeWPF.ViewModels
         /// </returns>\r
         private string GetPreferredSubtitleTrackLanguage()\r
         {\r
-            return this.SubtitleBehaviours.SelectedLangauges.FirstOrDefault(w => w != Constants.Any);\r
+            string langName = this.SubtitleBehaviours.SelectedLangauges.FirstOrDefault(w => w != Constants.Any);\r
+            string langCode = LanguageUtilities.GetLanguageCode(langName);\r
+            return langCode;\r
         }\r
 \r
         /// <summary>\r