WinGui:

- Fixed bug. --markers wasn't detected with user presets, only -m worked.

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

2 files changed, 5 insertions, 2 deletions

diff --git a/win/C#/Functions/Common.cs b/win/C#/Functions/Common.cs
index b55c8e566..3fc0b35e0 100644
--- a/win/C#/Functions/Common.cs
+++ b/win/C#/Functions/Common.cs
@@ -214,7 +214,7 @@ namespace Handbrake.Functions
             if (presetQuery.ChapterMarkers == true)

             {

                 mainWindow.Check_ChapterMarkers.CheckState = CheckState.Checked;

-                mainWindow.text_destination.Text = mainWindow.text_destination.Text.Replace(".mp4", ".m4v");

+                mainWindow.drop_format.SelectedIndex = 1;

             }

             else

                 mainWindow.Check_ChapterMarkers.CheckState = CheckState.Unchecked;

diff --git a/win/C#/Functions/QueryParser.cs b/win/C#/Functions/QueryParser.cs
index 01302860a..0d64749be 100644
--- a/win/C#/Functions/QueryParser.cs
+++ b/win/C#/Functions/QueryParser.cs
@@ -818,6 +818,7 @@ namespace Handbrake.Functions
             Match detelecine = Regex.Match(input, @"--detelecine");

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

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

+            Match chapterMarkersFileMode = Regex.Match(input, @"--markers");

             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");

@@ -1009,7 +1010,9 @@ namespace Handbrake.Functions
 

                 }

                 thisQuery.q_anamorphic = anamorphic.Success;

-                thisQuery.q_chapterMarkers = chapterMarkers.Success;

+                if (chapterMarkersFileMode.Success == true || chapterMarkers.Success == true)

+                    thisQuery.q_chapterMarkers = true;

+                

                 thisQuery.q_vfr = vfr.Success;

                 thisQuery.q_looseAnamorphic = lanamorphic.Success;