diff options
| author | sr55 <[email protected]> | 2009-10-20 22:28:55 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2009-10-20 22:28:55 +0000 |
| commit | 7ca9efc397bac13419a6ef30ee33826f987a1a5a (patch) | |
| tree | a3423c27f5af1f374498d294f0ae3812d9b5abb0 /win | |
| parent | 7c58ec4ca6b8e37efd8abc8bec139925a98d7ef9 (diff) | |
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
Diffstat (limited to 'win')
| -rw-r--r-- | win/C#/frmMain.cs | 6 |
1 files 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;
|