From 7ca9efc397bac13419a6ef30ee33826f987a1a5a Mon Sep 17 00:00:00 2001 From: sr55 Date: Tue, 20 Oct 2009 22:28:55 +0000 Subject: [PATCH] WinGui: - Fixed: Query Editor takes priority over GUI settings when "Prompt on unmatching queries" is disabled git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2893 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- win/C#/frmMain.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs index fccb3abfb..b8b7121e8 100644 --- 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) { DialogResult result = MessageBox.Show("The query under the \"Query Editor\" tab " + - "does not match the current GUI settings. Because the manual query takes " + + "does not match the current GUI settings.\n\nBecause the manual query takes " + "priority over the GUI, your recently updated settings will not be taken " + "into account when encoding this job." + Environment.NewLine + Environment.NewLine + - "Do you want to replace the manual query with the GUI-generated query?", + "Do you want to replace the manual query with the updated GUI-generated query?", "Manual Query does not Match GUI", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Asterisk, MessageBoxDefaultButton.Button3); @@ -718,7 +718,7 @@ namespace Handbrake } else { - query = generatedQuery; + query = specifiedQuery; } DialogResult overwrite = DialogResult.Yes; -- 2.40.0