WinGui: Couple of workaround fixes for the preset service until refactoring is completed.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7320 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs b/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
index a95c9b1eafd6f015a5dad0b7c8c6a4b4eabfb3c0..acc63874ff90e5ae8b215023c43dbf67fcf72b11 100644 (file)
--- a/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
@@ -242,9 +242,8 @@ namespace HandBrakeWPF.Services.Presets.Factories
             preset.Task.AllowedPassthruOptions.AudioEncoderFallback = EnumHelper<AudioEncoder>.GetValue(importedPreset.AudioEncoderFallback);\r
             preset.AudioTrackBehaviours.SelectedBehaviour = importedPreset.AudioTrackSelectionBehavior == "all"\r
                                                                      ? AudioBehaviourModes.AllMatching\r
-                                                                     : importedPreset.AudioTrackSelectionBehavior == "first"\r
-                                                                           ? AudioBehaviourModes.FirstMatch\r
-                                                                           : AudioBehaviourModes.None;\r
+                                                                     : AudioBehaviourModes.FirstMatch;\r
+            preset.AudioTrackBehaviours.SelectedTrackDefaultBehaviour = AudioTrackDefaultsMode.None;\r
 \r
             if (importedPreset.AudioCopyMask != null)\r
             {\r

diff --git a/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs b/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs
index c6e3c3e4b00a9543f47d69938e68ba72cd9b4e39..e3aee79bfe82262533f78de87fbdce38a11e2ae8 100644 (file)
--- a/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs
@@ -192,8 +192,6 @@ namespace HandBrakeWPF.Services.Presets
                 {\r
                     preset = JsonPresetFactory.ImportPreset(hbPreset);\r
                     preset.Category = UserPresetCatgoryName;\r
-                    preset.AudioTrackBehaviours = new AudioBehaviours();\r
-                    preset.SubtitleTrackBehaviours = new SubtitleBehaviours();\r
 \r
                     // Handle the PictureDecombDeinterlace key\r
                     if (preset.UseDeinterlace)\r
@@ -273,6 +271,8 @@ namespace HandBrakeWPF.Services.Presets
                     preset.PictureSettingsMode = update.PictureSettingsMode;\r
                     preset.Category = update.Category;\r
                     preset.Description = update.Description;\r
+                    preset.AudioTrackBehaviours = update.AudioTrackBehaviours;\r
+                    preset.SubtitleTrackBehaviours = update.SubtitleTrackBehaviours;\r
 \r
                     // Update the presets file\r
                     this.UpdatePresetFiles();\r