summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorsr55 <[email protected]>2010-11-27 22:43:41 +0000
committersr55 <[email protected]>2010-11-27 22:43:41 +0000
commit462eac327c30522a9301d5c8feeec849fd556f06 (patch)
tree6d8002457652d2de6f6afb0d39c04a93357c781d /win
parentaaecfe6931f6925746b39394e2fff42207c2cf6a (diff)
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
Diffstat (limited to 'win')
-rw-r--r--win/C#/HandBrake.Framework/Views/ExceptionWindow.designer.cs1
-rw-r--r--win/C#/frmMain.cs6
2 files changed, 5 insertions, 2 deletions
diff --git a/win/C#/HandBrake.Framework/Views/ExceptionWindow.designer.cs b/win/C#/HandBrake.Framework/Views/ExceptionWindow.designer.cs
index 79bd6b29e..f8df557f5 100644
--- 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);
this.Controls.Add(this.panel1);
this.Name = "ExceptionWindow";
+ this.TopMost = true;
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.PictureBox1)).EndInit();
diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 3b6474bdb..2f1467625 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -223,6 +223,10 @@ namespace Handbrake
encodeQueue.EncodeStarted += new EventHandler(encodeStarted);
encodeQueue.EncodeEnded += new EventHandler(encodeEnded);
+ // Scan Started and Completed Events
+ SourceScan.ScanStatusChanged += new EventHandler(SourceScan_ScanStatusChanged);
+ SourceScan.ScanCompleted += new EventHandler(SourceScan_ScanCompleted);
+
// Handle a file being draged onto the GUI.
this.DragEnter += new DragEventHandler(frmMain_DragEnter);
this.DragDrop += new DragEventHandler(frmMain_DragDrop);
@@ -2098,8 +2102,6 @@ namespace Handbrake
try
{
SourceScan.Scan(sourcePath, title);
- SourceScan.ScanStatusChanged += new EventHandler(SourceScan_ScanStatusChanged);
- SourceScan.ScanCompleted += new EventHandler(SourceScan_ScanCompleted);
}
catch (Exception exc)
{