WinGui:

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

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

diff --git a/win/C#/Functions/Common.cs b/win/C#/Functions/Common.cs
index b55c8e5..3fc0b35 100644 (file)
--- a/win/C#/Functions/Common.cs
+++ b/win/C#/Functions/Common.cs
@@ -214,7 +214,7 @@ namespace Handbrake.Functions
             if (presetQuery.ChapterMarkers == true)\r
             {\r
                 mainWindow.Check_ChapterMarkers.CheckState = CheckState.Checked;\r
-                mainWindow.text_destination.Text = mainWindow.text_destination.Text.Replace(".mp4", ".m4v");\r
+                mainWindow.drop_format.SelectedIndex = 1;\r
             }\r
             else\r
                 mainWindow.Check_ChapterMarkers.CheckState = CheckState.Unchecked;\r

diff --git a/win/C#/Functions/QueryParser.cs b/win/C#/Functions/QueryParser.cs
index 0130286..0d64749 100644 (file)
--- 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");\r
             Match anamorphic = Regex.Match(input, @" -p ");\r
             Match chapterMarkers = Regex.Match(input, @" -m");\r
+            Match chapterMarkersFileMode = Regex.Match(input, @"--markers");\r
             Match crop = Regex.Match(input, @"--crop ([0-9]*):([0-9]*):([0-9]*):([0-9]*)");\r
             Match vfr = Regex.Match(input, @" -V");\r
             Match lanamorphic = Regex.Match(input, @" -P");\r
@@ -1009,7 +1010,9 @@ namespace Handbrake.Functions
 \r
                 }\r
                 thisQuery.q_anamorphic = anamorphic.Success;\r
-                thisQuery.q_chapterMarkers = chapterMarkers.Success;\r
+                if (chapterMarkersFileMode.Success == true || chapterMarkers.Success == true)\r
+                    thisQuery.q_chapterMarkers = true;\r
+                \r
                 thisQuery.q_vfr = vfr.Success;\r
                 thisQuery.q_looseAnamorphic = lanamorphic.Success;\r
 \r