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

1 files changed, 5 insertions, 9 deletions

diff --git a/win/C#/Functions/Common.cs b/win/C#/Functions/Common.cs
index 7b702c489..27484000b 100644
--- a/win/C#/Functions/Common.cs
+++ b/win/C#/Functions/Common.cs
@@ -183,10 +183,7 @@ namespace Handbrake.Functions
             #region Chapter Markers

 

             if (presetQuery.ChapterMarkers == true)

-            {

                 mainWindow.Check_ChapterMarkers.CheckState = CheckState.Checked;

-                mainWindow.drop_format.SelectedIndex = 1;

-            }

             else

                 mainWindow.Check_ChapterMarkers.CheckState = CheckState.Unchecked;

 

@@ -289,6 +286,11 @@ namespace Handbrake.Functions
             mainWindow.drp_audenc_3.Text = presetQuery.AudioEncoder3;

             mainWindow.drp_audenc_4.Text = presetQuery.AudioEncoder4;

 

+            mainWindow.drp_audmix_1.Text = presetQuery.AudioTrackMix1;

+            mainWindow.drp_audmix_2.Text = presetQuery.AudioTrackMix2;

+            mainWindow.drp_audmix_3.Text = presetQuery.AudioTrackMix3;

+            mainWindow.drp_audmix_4.Text = presetQuery.AudioTrackMix4;

+

             if (presetQuery.AudioBitrate1 != null)

                 mainWindow.drp_audbit_1.Text = presetQuery.AudioBitrate1;

             mainWindow.drp_audbit_2.Text = presetQuery.AudioBitrate2;

@@ -301,12 +303,6 @@ namespace Handbrake.Functions
             mainWindow.drp_audsr_3.Text = presetQuery.AudioSamplerate3;

             mainWindow.drp_audsr_4.Text = presetQuery.AudioSamplerate4;

 

-            mainWindow.drp_audmix_1.Text = presetQuery.AudioTrackMix1;

-            mainWindow.drp_audmix_2.Text = presetQuery.AudioTrackMix2;

-            mainWindow.drp_audmix_3.Text = presetQuery.AudioTrackMix3;

-            mainWindow.drp_audmix_4.Text = presetQuery.AudioTrackMix4;

-

-

             // Dynamic Range Compression (Should be a float but we use double for ease)

             double value = 0;

             double actualValue = 0;