WinGui:

- Some updates / fixes to the new Activity Window

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

1 files changed, 7 insertions, 5 deletions

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 9763ddd3e..d74d8ef08 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -737,11 +737,10 @@ namespace Handbrake
                         setEncodeStarted(); // Encode is running, so setup the GUI appropriately

                         encodeQueue.StartEncodeQueue(); // Start The Queue Encoding Process

                         lastAction = "encode";   // Set the last action to encode - Used for activity window.

-

-                        if (ActivityWindow != null)

-                            ActivityWindow.SetEncodeMode();

-

                     }

+                    if (ActivityWindow != null)

+                        ActivityWindow.SetEncodeMode();

+

                     this.Focus();

                 }

                 else if (string.IsNullOrEmpty(sourcePath) || string.IsNullOrEmpty(text_destination.Text))

@@ -1434,6 +1433,9 @@ namespace Handbrake
             tb_preview.Enabled = false;

             mnu_killCLI.Visible = true;

 

+            if (ActivityWindow != null)

+                ActivityWindow.SetScanMode();

+

             // Start the Scan

             try

             {

@@ -1548,7 +1550,7 @@ namespace Handbrake
                 SourceScan.ScanCompleted -= new EventHandler(SourceScan_ScanCompleted);

                 EnableGUI();

                 ResetGUI();

-                

+

                 if (SourceScan.ScanProcess() != null)

                     SourceScan.ScanProcess().Kill();