WinGui:

- Default to VFR in the preset loading code if CFR and PFR is not set.

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

diff --git a/win/C#/Functions/PresetLoader.cs b/win/C#/Functions/PresetLoader.cs
index 82d3b9b8e7c812c8713a87e1d4c8e9184bc9051b..84fdb2dfb4b666fb56c2e4409bc45de875f0d2f0 100644 (file)
--- a/win/C#/Functions/PresetLoader.cs
+++ b/win/C#/Functions/PresetLoader.cs
@@ -227,18 +227,18 @@ namespace Handbrake.Functions
             {\r
                 // Constant or Peak Framerate for a set framerate.\r
 \r
-                if (presetQuery.FramerateMode == FramerateMode.PFR)\r
-                    mainWindow.radio_peakAndVariable.Checked = true;\r
-                else\r
+                if (presetQuery.FramerateMode == FramerateMode.CFR)\r
                     mainWindow.radio_constantFramerate.Checked = true;\r
-            } \r
+                else\r
+                    mainWindow.radio_peakAndVariable.Checked = true;\r
+            }\r
             else\r
             {\r
                 // Constant or Variable Framerate for Same as Source.\r
-                if (presetQuery.FramerateMode == FramerateMode.VFR)\r
-                    mainWindow.radio_peakAndVariable.Checked = true;\r
-                else\r
+                if (presetQuery.FramerateMode == FramerateMode.CFR)\r
                     mainWindow.radio_constantFramerate.Checked = true;\r
+                else\r
+                    mainWindow.radio_peakAndVariable.Checked = true;\r
             }\r
 \r
             mainWindow.check_turbo.CheckState = presetQuery.TurboFirstPass ? CheckState.Checked : CheckState.Unchecked;\r

diff --git a/win/C#/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs b/win/C#/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs
index 938eadc0fd1cc6fbb4080177412872eefc60ed16..18619170a1ac24b240009c479dc247b745c028e3 100644 (file)
--- a/win/C#/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs
+++ b/win/C#/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs
@@ -298,10 +298,10 @@ namespace HandBrake.ApplicationServices.Utilities
 \r
                 if (pfr.Success)\r
                     parsed.FramerateMode = FramerateMode.PFR;\r
-                else if (vfr.Success)\r
-                    parsed.FramerateMode = FramerateMode.VFR;\r
                 else if (cfr.Success)\r
                     parsed.FramerateMode = FramerateMode.CFR;\r
+                else\r
+                    parsed.FramerateMode = FramerateMode.VFR; // Default to VFR\r
 \r
                 parsed.Grayscale = grayscale.Success;\r
                 parsed.TwoPass = twoPass.Success;\r