summaryrefslogtreecommitdiffstats
path: root/win/C#/Functions
diff options
context:
space:
mode:
authorsr55 <[email protected]>2008-09-14 20:50:55 +0000
committersr55 <[email protected]>2008-09-14 20:50:55 +0000
commit46b030f0d27838a600d07850e9390a9f579f4317 (patch)
tree956873f3f1ffdd5593e953e5ea9348f807ccde37 /win/C#/Functions
parentb4e47744bb7cbcfcb3b14cc9b2fbffd1919861d7 (diff)
WinGui:
- Fix: Cropping setting incorrectly set if --crop 0:0:0:0 is used in a preset. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1697 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/C#/Functions')
-rw-r--r--win/C#/Functions/Common.cs8
-rw-r--r--win/C#/Functions/QueryParser.cs2
2 files changed, 8 insertions, 2 deletions
diff --git a/win/C#/Functions/Common.cs b/win/C#/Functions/Common.cs
index 7b3e36fc9..8ef4b3b8d 100644
--- a/win/C#/Functions/Common.cs
+++ b/win/C#/Functions/Common.cs
@@ -110,7 +110,13 @@ namespace Handbrake.Functions
#region Picture
if (presetQuery.CropTop == "0" && presetQuery.CropBottom == "0" && presetQuery.CropLeft == "0" && presetQuery.CropRight == "0")
- mainWindow.check_autoCrop.Checked = true;
+ {
+ mainWindow.check_customCrop.Checked = true;
+ mainWindow.text_top.Text = "0";
+ mainWindow.text_bottom.Text = "0";
+ mainWindow.text_left.Text = "0";
+ mainWindow.text_right.Text = "0";
+ }
else if (presetQuery.CropTop != null && presetQuery.CropBottom != null && presetQuery.CropLeft != null && presetQuery.CropRight != null)
{
mainWindow.check_customCrop.Checked = true;
diff --git a/win/C#/Functions/QueryParser.cs b/win/C#/Functions/QueryParser.cs
index 347e3f988..01302860a 100644
--- a/win/C#/Functions/QueryParser.cs
+++ b/win/C#/Functions/QueryParser.cs
@@ -818,7 +818,7 @@ namespace Handbrake.Functions
Match detelecine = Regex.Match(input, @"--detelecine");
Match anamorphic = Regex.Match(input, @" -p ");
Match chapterMarkers = Regex.Match(input, @" -m");
- Match crop = Regex.Match(input, @"--crop ([0-9]):([0-9]):([0-9]):([0-9])");
+ Match crop = Regex.Match(input, @"--crop ([0-9]*):([0-9]*):([0-9]*):([0-9]*)");
Match vfr = Regex.Match(input, @" -V");
Match lanamorphic = Regex.Match(input, @" -P");
Match decomb = Regex.Match(input, @" --decomb");