WinGui:

- Fixed: Query Editor takes priority over GUI settings when "Prompt on unmatching queries" is disabled

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

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index fccb3ab..b8b7121 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -692,10 +692,10 @@ namespace Handbrake
                     if (Properties.Settings.Default.PromptOnUnmatchingQueries && !string.IsNullOrEmpty(specifiedQuery) && generatedQuery != specifiedQuery)\r
                     {\r
                         DialogResult result = MessageBox.Show("The query under the \"Query Editor\" tab " +\r
-                            "does not match the current GUI settings. Because the manual query takes " +\r
+                            "does not match the current GUI settings.\n\nBecause the manual query takes " +\r
                             "priority over the GUI, your recently updated settings will not be taken " +\r
                             "into account when encoding this job." + Environment.NewLine + Environment.NewLine +\r
-                            "Do you want to replace the manual query with the GUI-generated query?",\r
+                            "Do you want to replace the manual query with the updated GUI-generated query?",\r
                             "Manual Query does not Match GUI",\r
                             MessageBoxButtons.YesNoCancel, MessageBoxIcon.Asterisk,\r
                             MessageBoxDefaultButton.Button3);\r
@@ -718,7 +718,7 @@ namespace Handbrake
                     }\r
                     else\r
                     {\r
-                        query = generatedQuery;\r
+                        query = specifiedQuery;\r
                     }\r
 \r
                     DialogResult overwrite = DialogResult.Yes;\r