WinGui:

- Fixed issue with iPod Atom displaying an error with the new presets when switching from a preset with ipod atom to one without.
- Fixed the CLI preset grab during startup. This wasn't working.

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

2 files changed, 19 insertions, 9 deletions

diff --git a/win/C#/Functions/Common.cs b/win/C#/Functions/Common.cs
index 1f938a0f9..fbd9b6429 100644
--- a/win/C#/Functions/Common.cs
+++ b/win/C#/Functions/Common.cs
@@ -126,6 +126,10 @@ namespace Handbrake.Functions
 

             // Source tab

             #region source

+            // Reset some vaules to stock first to prevent errors.

+            mainWindow.check_iPodAtom.CheckState = CheckState.Unchecked;

+

+            // Now load all the new settings onto the main window

             if (presetQuery.Source != "")

                 mainWindow.text_source.Text = presetQuery.Source;

 

@@ -160,6 +164,16 @@ namespace Handbrake.Functions
             mainWindow.drp_videoEncoder.Text = presetQuery.VideoEncoder;

             mainWindow.drp_audioCodec.Text = presetQuery.AudioEncoder;

 

+            if (presetQuery.IpodAtom == true)

+                mainWindow.check_iPodAtom.CheckState = CheckState.Checked;

+            else

+                mainWindow.check_iPodAtom.CheckState = CheckState.Unchecked;

+

+            if (presetQuery.OptimizeMP4 == true)

+                mainWindow.check_optimiseMP4.CheckState = CheckState.Checked;

+            else

+                mainWindow.check_optimiseMP4.CheckState = CheckState.Unchecked;

+

             #endregion

 

             // Picture Settings Tab

@@ -254,15 +268,7 @@ namespace Handbrake.Functions
             else

                 mainWindow.check_largeFile.CheckState = CheckState.Unchecked;

 

-            if (presetQuery.IpodAtom == true)

-                mainWindow.check_iPodAtom.CheckState = CheckState.Checked;

-            else

-                mainWindow.check_iPodAtom.CheckState = CheckState.Unchecked;

-

-            if (presetQuery.OptimizeMP4 == true)

-                mainWindow.check_optimiseMP4.CheckState = CheckState.Checked;

-            else

-                mainWindow.check_optimiseMP4.CheckState = CheckState.Unchecked;

+            

 

             #endregion

 

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 45d1b287f..07eac66cd 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -75,6 +75,10 @@ namespace Handbrake
             // Load the presets

             lblStatus.Text = "Loading Presets ...";

             Application.DoEvents();

+            if (Properties.Settings.Default.updatePresets == "Checked")

+            {

+                grabCLIPresets();

+            }

             loadPresetPanel();

             Thread.Sleep(200);