WinGui:

- Don't try set the quality slider when the preset doesn't use it.

git-svn-id: svn://localhost/HandBrake/trunk@3064 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/C#/Functions/PresetLoader.cs b/win/C#/Functions/PresetLoader.cs
index b484b69..5f04590 100644 (file)
--- a/win/C#/Functions/PresetLoader.cs
+++ b/win/C#/Functions/PresetLoader.cs
@@ -155,40 +155,42 @@ namespace Handbrake.Functions
 \r
             // Quality\r
 \r
-            mainWindow.radio_cq.Checked = true;\r
-            if (presetQuery.VideoEncoder == "H.264 (x264)")\r
+            if (presetQuery.VideoQuality != -1)\r
             {\r
-                double cqStep = Properties.Settings.Default.x264cqstep;\r
-                int value;\r
-                double x264step = cqStep;\r
-                double presetValue = presetQuery.VideoQuality;\r
-\r
-                double x = 51 / x264step;\r
-\r
-                double calculated = presetValue / x264step;\r
-                calculated = x - calculated;\r
-\r
-                int.TryParse(calculated.ToString(), out value);\r
-\r
-                // This will sometimes occur when the preset was generated \r
-                // with a different granularity, so, round and try again.\r
-                if (value == 0)\r
+                mainWindow.radio_cq.Checked = true;\r
+                if (presetQuery.VideoEncoder == "H.264 (x264)")\r
                 {\r
-                    double val = Math.Round(calculated, 0);\r
-                    int.TryParse(val.ToString(), out value);\r
+                    double cqStep = Properties.Settings.Default.x264cqstep;\r
+                    int value;\r
+                    double x264step = cqStep;\r
+                    double presetValue = presetQuery.VideoQuality;\r
+\r
+                    double x = 51/x264step;\r
+\r
+                    double calculated = presetValue/x264step;\r
+                    calculated = x - calculated;\r
+\r
+                    int.TryParse(calculated.ToString(), out value);\r
+\r
+                    // This will sometimes occur when the preset was generated \r
+                    // with a different granularity, so, round and try again.\r
+                    if (value == 0)\r
+                    {\r
+                        double val = Math.Round(calculated, 0);\r
+                        int.TryParse(val.ToString(), out value);\r
+                    }\r
+                    if (value <= mainWindow.slider_videoQuality.Maximum)\r
+                        mainWindow.slider_videoQuality.Value = value;\r
+                }\r
+                else\r
+                {\r
+                    int presetVal;\r
+                    int.TryParse(presetQuery.VideoQuality.ToString(), out presetVal);\r
+                    if (presetVal > mainWindow.slider_videoQuality.Minimum)\r
+                        mainWindow.slider_videoQuality.Value = presetVal;\r
                 }\r
-                if (value <= mainWindow.slider_videoQuality.Maximum)\r
-                    mainWindow.slider_videoQuality.Value = value;\r
-            }\r
-            else\r
-            {\r
-                int presetVal;\r
-                int.TryParse(presetQuery.VideoQuality.ToString(), out presetVal);\r
-                if (presetVal > mainWindow.slider_videoQuality.Minimum)\r
-                    mainWindow.slider_videoQuality.Value = presetVal;\r
             }\r
 \r
-\r
             mainWindow.check_2PassEncode.CheckState = presetQuery.TwoPass ? CheckState.Checked : CheckState.Unchecked;\r
 \r
             mainWindow.drp_videoFramerate.Text = presetQuery.VideoFramerate;\r

diff --git a/win/C#/Functions/QueryParser.cs b/win/C#/Functions/QueryParser.cs
index 7230ad9..78a73b5 100644 (file)
--- a/win/C#/Functions/QueryParser.cs
+++ b/win/C#/Functions/QueryParser.cs
@@ -329,7 +329,9 @@ namespace Handbrake.Functions
                 {\r
                     float qConvert = float.Parse(videoQuality.ToString().Replace("-q ", ""), Culture);\r
                     thisQuery.VideoQuality = qConvert;\r
-                }\r
+                } \r
+                else\r
+                    thisQuery.VideoQuality = -1;\r
                 #endregion\r
 \r
                 #region Audio Tab\r