WinGui:

- Make sure the Activity window resets correctly on action or source change.

git-svn-id: svn://localhost/HandBrake/trunk@2998 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/C#/frmActivityWindow.cs b/win/C#/frmActivityWindow.cs
index 6b1ffee..61d1b06 100644 (file)
--- a/win/C#/frmActivityWindow.cs
+++ b/win/C#/frmActivityWindow.cs
@@ -10,7 +10,6 @@ using System.Text;
 using System.Windows.Forms;\r
 using System.IO;\r
 using System.Threading;\r
-using Handbrake.EncodeQueue;\r
 using Handbrake.Functions;\r
 using Microsoft.Win32;\r
 \r
@@ -29,6 +28,8 @@ namespace Handbrake
 \r
         public frmActivityWindow(string mode)\r
         {\r
+            kilLThread = false;\r
+            _position = 0;\r
             if (mode == "scan")\r
                 SetScanMode();\r
             else\r
@@ -39,9 +40,7 @@ namespace Handbrake
         private void NewActivityWindow_Load(object sender, EventArgs e)\r
         {\r
             monitor = new Thread(LogMonitor);\r
-            _position = 0;\r
-            kilLThread = false;\r
-\r
+            \r
             try\r
             {\r
                 monitor.Start();\r
@@ -62,11 +61,7 @@ namespace Handbrake
                 // Perform a reset if require.\r
                 // If we have switched to a different log file, we want to start from the beginning.\r
                 if (SetLogFile != _lastMode)\r
-                {\r
-                    _position = 0;\r
-                    ClearWindowText();\r
-                    PrintLogHeader();\r
-                }\r
+                    Reset();\r
 \r
                 // Perform the window update\r
                 switch (SetLogFile)\r
@@ -189,7 +184,7 @@ namespace Handbrake
                 MessageBox.Show("ClearWindowText(): Exception: \n" + exc);\r
             }\r
         }\r
-        public void PrintLogHeader()\r
+        private void PrintLogHeader()\r
         {\r
             try\r
             {\r
@@ -221,6 +216,12 @@ namespace Handbrake
             }\r
 \r
         }\r
+        private void Reset()\r
+        {\r
+            _position = 0;\r
+            ClearWindowText();\r
+            PrintLogHeader();\r
+        }\r
 \r
         #region Public\r
 \r
@@ -231,11 +232,13 @@ namespace Handbrake
         }\r
         public void SetScanMode()\r
         {\r
+            Reset();\r
             SetLogFile = "last_scan_log.txt";\r
             this.Text = "Activity Window (Scan Log)";\r
         }\r
         public void SetEncodeMode()\r
         {\r
+            Reset();\r
             SetLogFile = "last_encode_log.txt";\r
             this.Text = "Activity Window (Enocde Log)";\r
         }\r