WinGui:

- Fix preset bug where mkv and chapters are used in the preset, but on selecting said preset, the selected file extension would be m4v
- Fix in Audio panel where the track 1 bit-rate is not always set correctly if the preset also changes the audio mixdown

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

diff --git a/win/C#/Functions/Common.cs b/win/C#/Functions/Common.cs
index 7b702c489cbc45fe2dfa525ea4f2ee930f784d93..27484000bf2057e393a9b6fea3aa241cb9c1ea20 100644 (file)
--- a/win/C#/Functions/Common.cs
+++ b/win/C#/Functions/Common.cs
@@ -183,10 +183,7 @@ namespace Handbrake.Functions
             #region Chapter Markers\r
 \r
             if (presetQuery.ChapterMarkers == true)\r
-            {\r
                 mainWindow.Check_ChapterMarkers.CheckState = CheckState.Checked;\r
-                mainWindow.drop_format.SelectedIndex = 1;\r
-            }\r
             else\r
                 mainWindow.Check_ChapterMarkers.CheckState = CheckState.Unchecked;\r
 \r
@@ -289,6 +286,11 @@ namespace Handbrake.Functions
             mainWindow.drp_audenc_3.Text = presetQuery.AudioEncoder3;\r
             mainWindow.drp_audenc_4.Text = presetQuery.AudioEncoder4;\r
 \r
+            mainWindow.drp_audmix_1.Text = presetQuery.AudioTrackMix1;\r
+            mainWindow.drp_audmix_2.Text = presetQuery.AudioTrackMix2;\r
+            mainWindow.drp_audmix_3.Text = presetQuery.AudioTrackMix3;\r
+            mainWindow.drp_audmix_4.Text = presetQuery.AudioTrackMix4;\r
+\r
             if (presetQuery.AudioBitrate1 != null)\r
                 mainWindow.drp_audbit_1.Text = presetQuery.AudioBitrate1;\r
             mainWindow.drp_audbit_2.Text = presetQuery.AudioBitrate2;\r
@@ -301,12 +303,6 @@ namespace Handbrake.Functions
             mainWindow.drp_audsr_3.Text = presetQuery.AudioSamplerate3;\r
             mainWindow.drp_audsr_4.Text = presetQuery.AudioSamplerate4;\r
 \r
-            mainWindow.drp_audmix_1.Text = presetQuery.AudioTrackMix1;\r
-            mainWindow.drp_audmix_2.Text = presetQuery.AudioTrackMix2;\r
-            mainWindow.drp_audmix_3.Text = presetQuery.AudioTrackMix3;\r
-            mainWindow.drp_audmix_4.Text = presetQuery.AudioTrackMix4;\r
-\r
-\r
             // Dynamic Range Compression (Should be a float but we use double for ease)\r
             double value = 0;\r
             double actualValue = 0;\r