Fix an issue applying audio codec settings from the defaults which are different...

diff --git a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
index 7c7c3df3c5f29334f0eb46e9c8fa3a429c7aa20f..232ed35673bfc391906b5a69e0406f15f8c0dea0 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
@@ -332,17 +332,17 @@ namespace HandBrakeWPF.ViewModels
                         return;\r
                     }\r
 \r
-                    switch (this.AudioDefaultsViewModel.AudioBehaviours.SelectedTrackDefaultBehaviour)\r
+                    switch (this.AudioBehaviours.SelectedTrackDefaultBehaviour)\r
                     {\r
                         case AudioTrackDefaultsMode.None:\r
                             this.Task.AudioTracks.Add(new AudioTrack { ScannedTrack = track });\r
                             break;\r
                         case AudioTrackDefaultsMode.FirstTrack:\r
-                            AudioBehaviourTrack template = this.currentPreset.AudioTrackBehaviours.BehaviourTracks.FirstOrDefault();\r
+                            AudioBehaviourTrack template = this.AudioBehaviours.BehaviourTracks.FirstOrDefault();\r
                             this.Task.AudioTracks.Add(template != null ? new AudioTrack(template) { ScannedTrack = track } : new AudioTrack { ScannedTrack = track });\r
                             break;\r
                         case AudioTrackDefaultsMode.AllTracks:\r
-                            foreach (AudioBehaviourTrack tmpl in this.currentPreset.AudioTrackBehaviours.BehaviourTracks)\r
+                            foreach (AudioBehaviourTrack tmpl in this.AudioBehaviours.BehaviourTracks)\r
                             {\r
                                 this.Task.AudioTracks.Add(tmpl != null ? new AudioTrack(tmpl) { ScannedTrack = track } : new AudioTrack { ScannedTrack = track });\r
                             }\r
@@ -400,7 +400,7 @@ namespace HandBrakeWPF.ViewModels
             }\r
            \r
             // Step 4, Handle the default selection behaviour.\r
-            switch (this.AudioDefaultsViewModel.AudioBehaviours.SelectedBehaviour)\r
+            switch (this.AudioBehaviours.SelectedBehaviour)\r
             {\r
                 case AudioBehaviourModes.None:\r
                     this.Task.AudioTracks.Clear();\r
@@ -472,9 +472,9 @@ namespace HandBrakeWPF.ViewModels
             // The first track in the selected languages list is considered the preferred language.\r
             // So, try match tracks on this.\r
             IEnumerable<Audio> preferredAudioTracks = new List<Audio>();\r
-            if (this.AudioDefaultsViewModel.AudioBehaviours.SelectedLangauges.Count > 0)\r
+            if (this.AudioBehaviours.SelectedLangauges.Count > 0)\r
             {\r
-                string langName = this.AudioDefaultsViewModel.AudioBehaviours.SelectedLangauges.FirstOrDefault(w => !w.Equals(Constants.Any));\r
+                string langName = this.AudioBehaviours.SelectedLangauges.FirstOrDefault(w => !w.Equals(Constants.Any));\r
                 if (!string.IsNullOrEmpty(langName))\r
                 {\r
                     preferredAudioTracks = this.SourceTracks.Where(item => item.Language.Contains(langName));\r
@@ -497,7 +497,7 @@ namespace HandBrakeWPF.ViewModels
         {\r
             List<Audio> trackList = new List<Audio>();\r
 \r
-            List<string> isoCodes = LanguageUtilities.GetLanguageCodes(this.AudioDefaultsViewModel.AudioBehaviours.SelectedLangauges.ToArray());\r
+            List<string> isoCodes = LanguageUtilities.GetLanguageCodes(this.AudioBehaviours.SelectedLangauges.ToArray());\r
 \r
             if (includeAny)\r
             {\r