diff options
| author | sr55 <[email protected]> | 2011-03-05 19:42:27 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2011-03-05 19:42:27 +0000 |
| commit | ff970fe15303a8f53237f0639adee83b44f37bbc (patch) | |
| tree | 243a2b4ee16e221720695c8172464cb4b5676a53 | |
| parent | 4743f841ea47a59d1700c1e24e9b6f0d150aa463 (diff) | |
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
| -rw-r--r-- | win/C#/Functions/PresetLoader.cs | 14 | ||||
| -rw-r--r-- | win/C#/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/win/C#/Functions/PresetLoader.cs b/win/C#/Functions/PresetLoader.cs index 82d3b9b8e..84fdb2dfb 100644 --- a/win/C#/Functions/PresetLoader.cs +++ b/win/C#/Functions/PresetLoader.cs @@ -227,18 +227,18 @@ namespace Handbrake.Functions {
// Constant or Peak Framerate for a set framerate.
- if (presetQuery.FramerateMode == FramerateMode.PFR)
- mainWindow.radio_peakAndVariable.Checked = true;
- else
+ if (presetQuery.FramerateMode == FramerateMode.CFR)
mainWindow.radio_constantFramerate.Checked = true;
- }
+ else
+ mainWindow.radio_peakAndVariable.Checked = true;
+ }
else
{
// Constant or Variable Framerate for Same as Source.
- if (presetQuery.FramerateMode == FramerateMode.VFR)
- mainWindow.radio_peakAndVariable.Checked = true;
- else
+ if (presetQuery.FramerateMode == FramerateMode.CFR)
mainWindow.radio_constantFramerate.Checked = true;
+ else
+ mainWindow.radio_peakAndVariable.Checked = true;
}
mainWindow.check_turbo.CheckState = presetQuery.TurboFirstPass ? CheckState.Checked : CheckState.Unchecked;
diff --git a/win/C#/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs b/win/C#/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs index 938eadc0f..18619170a 100644 --- a/win/C#/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs +++ b/win/C#/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs @@ -298,10 +298,10 @@ namespace HandBrake.ApplicationServices.Utilities if (pfr.Success)
parsed.FramerateMode = FramerateMode.PFR;
- else if (vfr.Success)
- parsed.FramerateMode = FramerateMode.VFR;
else if (cfr.Success)
parsed.FramerateMode = FramerateMode.CFR;
+ else
+ parsed.FramerateMode = FramerateMode.VFR; // Default to VFR
parsed.Grayscale = grayscale.Success;
parsed.TwoPass = twoPass.Success;
|