WinGui:

- Some fixes to the ActivityWindow. CLI query should always be displayed now.

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

1 files changed, 4 insertions, 3 deletions

diff --git a/win/C#/EncodeQueue/EncodeAndQueueHandler.cs b/win/C#/EncodeQueue/EncodeAndQueueHandler.cs
index 6d8a2ce2f..93cab845a 100644
--- a/win/C#/EncodeQueue/EncodeAndQueueHandler.cs
+++ b/win/C#/EncodeQueue/EncodeAndQueueHandler.cs
@@ -336,6 +336,7 @@ namespace Handbrake.EncodeQueue
                     Thread.Sleep(5000);

                 }

             }

+            LastEncode = new Job();

 

             if (QueueCompleted != null)

                 QueueCompleted(this, new EventArgs());

@@ -361,6 +362,8 @@ namespace Handbrake.EncodeQueue
         {

             try

             {

+                isEncoding = true;

+

                 string handbrakeCLIPath = Path.Combine(Application.StartupPath, "HandBrakeCLI.exe");

                 string logPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\logs", "last_encode_log.txt");

                 string strCmdLine = String.Format(@" /C """"{0}"" {1} 2>""{2}"" """, handbrakeCLIPath, query, logPath);

@@ -376,8 +379,7 @@ namespace Handbrake.EncodeQueue
 

                 Process[] before = Process.GetProcesses(); // Get a list of running processes before starting.

                 hbProcess = Process.Start(cliStart);

-                processID = Main.getCliProcess(before);

-                isEncoding = true;

+                processID = Main.getCliProcess(before); 

                 currentQuery = query;

                 if (hbProcess != null)

                     processHandle = hbProcess.MainWindowHandle; // Set the process Handle

@@ -414,7 +416,6 @@ namespace Handbrake.EncodeQueue
             {

                 MessageBox.Show("It would appear that HandBrakeCLI has not started correctly. You should take a look at the Activity log as it may indicate the reason why.\n\n   Detailed Error Information: error occured in runCli()\n\n" + exc, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);

             }

-

         }

 

         /// <summary>