WinGui:

- Add a notice to the log to indicate if the user has used a custom query.

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

1 files changed, 5 insertions, 3 deletions

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 4e3a73ff9..2be9b168b 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -729,7 +729,7 @@ namespace Handbrake
                     if (overwrite == DialogResult.Yes)

                     {

                         if (encodeQueue.Count == 0)

-                            encodeQueue.AddJob(query, sourcePath, text_destination.Text);

+                            encodeQueue.AddJob(query, sourcePath, text_destination.Text, (rtf_query.Text != ""));

 

                         queueWindow.setQueue();

                         if (encodeQueue.Count > 1)

@@ -764,11 +764,11 @@ namespace Handbrake
                     DialogResult result = MessageBox.Show("There is already a queue item for this destination path. \n\n If you continue, the encode will be overwritten. Do you wish to continue?",

                   "Warning", MessageBoxButtons.YesNo, MessageBoxIcon.Warning);

                     if (result == DialogResult.Yes)

-                        encodeQueue.AddJob(query, sourcePath, text_destination.Text);

+                        encodeQueue.AddJob(query, sourcePath, text_destination.Text, (rtf_query.Text != ""));

 

                 }

                 else

-                    encodeQueue.AddJob(query, sourcePath, text_destination.Text);

+                    encodeQueue.AddJob(query, sourcePath, text_destination.Text, (rtf_query.Text != ""));

 

                 lbl_encode.Text = encodeQueue.Count + " encode(s) pending in the queue";

 

@@ -806,6 +806,8 @@ namespace Handbrake
             if (ActivityWindow == null)

                 ActivityWindow = new frmActivityWindow(file, encodeQueue, this);

 

+            ActivityWindow.SetLogView(!encodeQueue.isEncoding);

+

             ActivityWindow.Show();

         }

         #endregion