WinGui:

- Issue in the query parser where "-2" would trigger a widget if found anywhere in the CLI string.
  This could appear in the source or destination filename and trigger it when it is not supposed to be on.
  added a space before the - in the regex which will hopefully be sufficient to fix the issue.

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

1 files changed, 12 insertions, 12 deletions

diff --git a/win/C#/Functions/QueryParser.cs b/win/C#/Functions/QueryParser.cs
index ae5d39cb9..a4b2f5a95 100644
--- a/win/C#/Functions/QueryParser.cs
+++ b/win/C#/Functions/QueryParser.cs
@@ -796,10 +796,10 @@ namespace Handbrake.Functions
             Match denoise = Regex.Match(input, @"--denoise=\""([a-zA-Z]*)\""");

             Match deblock = Regex.Match(input, @"--deblock");

             Match detelecine = Regex.Match(input, @"--detelecine");

-            Match anamorphic = Regex.Match(input, @"-p ");

-            Match chapterMarkers = Regex.Match(input, @"-m");

+            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 vfr = Regex.Match(input, @"-V");

+            Match vfr = Regex.Match(input, @" -V");

             Match lanamorphic = Regex.Match(input, @"-P");

 

             //Video Settings Tab

@@ -807,12 +807,12 @@ namespace Handbrake.Functions
             Match videoBitrate = Regex.Match(input, @"-b ([0-9]*)");

             Match videoQuality = Regex.Match(input, @"-q ([0-9.]*)");

             Match videoFilesize = Regex.Match(input, @"-S ([0-9.]*)");

-            Match twoPass = Regex.Match(input, @"-2");

-            Match turboFirstPass = Regex.Match(input, @"-T");

-            Match grayscale = Regex.Match(input, @"-g");

-            Match largerMp4 = Regex.Match(input, @"-4");

-            Match ipodAtom = Regex.Match(input, @"-I");

-            Match optimizeMP4 = Regex.Match(input, @"-O");

+            Match twoPass = Regex.Match(input, @" -2 ");

+            Match turboFirstPass = Regex.Match(input, @" -T");

+            Match grayscale = Regex.Match(input, @" -g");

+            Match largerMp4 = Regex.Match(input, @" -4");

+            Match ipodAtom = Regex.Match(input, @" -I");

+            Match optimizeMP4 = Regex.Match(input, @" -O");

 

             //Audio Settings Tab

             Match audioTrack1 = Regex.Match(input, @"-a ([0-9]*)");

@@ -846,14 +846,14 @@ namespace Handbrake.Functions
             Match drc4 = Regex.Match(input, @"-D ([0-9.]*),([0-9.]*),([0-9.]*),([0-9.]*)");

 

             Match subtitles = Regex.Match(input, @"-s ([0-9a-zA-Z]*)");

-            Match subScan = Regex.Match(input, @"-U");

-            Match forcedSubtitles = Regex.Match(input, @"-F");

+            Match subScan = Regex.Match(input, @" -U");

+            Match forcedSubtitles = Regex.Match(input, @" -F");

 

             //H264 Tab

             Match x264 = Regex.Match(input, @"-x ([.,/a-zA-Z0-9=:-]*)");

 

             //Program Options

-            Match verbose = Regex.Match(input, @"-v");

+            Match verbose = Regex.Match(input, @" -v");

             #endregion

 

             #region Set Varibles