WinGui:

- Picture Settings: Height of 0 allows for no -l to be passed to the CLI
- Picture Settings / pre-sets now set 0 when no Height specified. Prevents the panel from using incorrect values when pre-sets are selected.
- Simplified the Encode.cs set-up. Includes changes to QueueHandler

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

1 files changed, 4 insertions, 1 deletions

diff --git a/win/C#/Functions/PresetLoader.cs b/win/C#/Functions/PresetLoader.cs
index 15eb741a8..f6ea60e57 100644
--- a/win/C#/Functions/PresetLoader.cs
+++ b/win/C#/Functions/PresetLoader.cs
@@ -72,7 +72,7 @@ namespace Handbrake.Functions
                 if (presetQuery.CropLeft == "0" && presetQuery.CropRight == "0")

                     mainWindow.pictureSettings.check_customCrop.Checked = true;

 

-            if (pictureSettings)

+            if (pictureSettings) // only Load picture settings if the perset requires it

             {

                 if (presetQuery.CropTop != null)

                 {

@@ -110,6 +110,8 @@ namespace Handbrake.Functions
 

             if (presetQuery.Height != 0)

                 mainWindow.pictureSettings.text_height.Value = presetQuery.Height;

+            else

+                mainWindow.pictureSettings.text_height.Value = 0;

 

             // Max Width/Height override Width/Height

             if (presetQuery.MaxWidth != 0)

@@ -125,6 +127,7 @@ namespace Handbrake.Functions
             }

             mainWindow.pictureSettings.setMax();

 

+

             #endregion

 

             #region Filters