WinGui:

- Fix a bug with the Scan Started and Ended Event Handlers.
- Make the Error window Top Most.

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

diff --git a/win/C#/HandBrake.Framework/Views/ExceptionWindow.designer.cs b/win/C#/HandBrake.Framework/Views/ExceptionWindow.designer.cs
index 79bd6b29eec4782abd0f8ef6dbd2daaa4f62d192..f8df557f581d963a44e35f7f39d992a6d741dc56 100644 (file)
--- a/win/C#/HandBrake.Framework/Views/ExceptionWindow.designer.cs
+++ b/win/C#/HandBrake.Framework/Views/ExceptionWindow.designer.cs
@@ -156,6 +156,7 @@
             this.Controls.Add(this.panel4);\r
             this.Controls.Add(this.panel1);\r
             this.Name = "ExceptionWindow";\r
+            this.TopMost = true;\r
             this.panel1.ResumeLayout(false);\r
             this.panel1.PerformLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.PictureBox1)).EndInit();\r

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 3b6474bdb0a953ad2f87c0642a41300684839873..2f1467625931789930468ba84439032b443be03b 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -223,6 +223,10 @@ namespace Handbrake
             encodeQueue.EncodeStarted += new EventHandler(encodeStarted);\r
             encodeQueue.EncodeEnded += new EventHandler(encodeEnded);\r
 \r
+            // Scan Started and Completed Events\r
+            SourceScan.ScanStatusChanged += new EventHandler(SourceScan_ScanStatusChanged);\r
+            SourceScan.ScanCompleted += new EventHandler(SourceScan_ScanCompleted);\r
+\r
             // Handle a file being draged onto the GUI.\r
             this.DragEnter += new DragEventHandler(frmMain_DragEnter);\r
             this.DragDrop += new DragEventHandler(frmMain_DragDrop);\r
@@ -2098,8 +2102,6 @@ namespace Handbrake
             try\r
             {\r
                 SourceScan.Scan(sourcePath, title);\r
-                SourceScan.ScanStatusChanged += new EventHandler(SourceScan_ScanStatusChanged);\r
-                SourceScan.ScanCompleted += new EventHandler(SourceScan_ScanCompleted);\r
             }\r
             catch (Exception exc)\r
             {\r