WinGui:

- ActivityWindow Make sure the correct log is selected (Last action: scan or encode)
- Make closing the window more responsive.

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

1 files changed, 19 insertions, 3 deletions

diff --git a/win/C#/frmActivityWindow.cs b/win/C#/frmActivityWindow.cs
index af7b62107..6b1ffee98 100644
--- a/win/C#/frmActivityWindow.cs
+++ b/win/C#/frmActivityWindow.cs
@@ -27,13 +27,17 @@ namespace Handbrake
         private Thread monitor;

         private Boolean kilLThread;

 

-        public frmActivityWindow()

+        public frmActivityWindow(string mode)

         {

+            if (mode == "scan")

+                SetScanMode();

+            else

+                SetEncodeMode();

+

             InitializeComponent();

         }

         private void NewActivityWindow_Load(object sender, EventArgs e)

         {

-            SetScanMode();

             monitor = new Thread(LogMonitor);

             _position = 0;

             kilLThread = false;

@@ -77,7 +81,15 @@ namespace Handbrake
                         break;

                 }

 

-                Thread.Sleep(750);

+                try

+                {

+                    Thread.Sleep(1000);

+                }

+                catch (ThreadInterruptedException)

+                {

+                    // Do Nothnig.

+                }

+

             }

         }

         private StringBuilder ReadFile(string file)

@@ -148,6 +160,9 @@ namespace Handbrake
                     else

                         rtf_actLog.AppendText(text.ToString());

                 }

+            } catch(ThreadInterruptedException)

+            {

+                // Do Nothing

             }

             catch (Exception exc)

             {

@@ -301,6 +316,7 @@ namespace Handbrake
         protected override void OnClosing(CancelEventArgs e)

         {

             kilLThread = true;

+            monitor.Interrupt();

             monitor.Join();

             e.Cancel = true;

             this.Dispose();