summaryrefslogtreecommitdiffstats
path: root/win/C#
diff options
context:
space:
mode:
authorsr55 <[email protected]>2007-08-31 12:32:11 +0000
committersr55 <[email protected]>2007-08-31 12:32:11 +0000
commitb3a10e705540459c4c038dd2fc795627c3af11f3 (patch)
tree693987adf1580c8d26c89ff09466646f78c8ed80 /win/C#
parentbdd995d08b5a4e7a72063ac58b8c47d629f2a070 (diff)
WinGui:
- Fixed possible cross-thread issue when closing the application (when more than 1 window is open) - Added "Quit HandBrake" to the on complete options. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@909 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/C#')
-rw-r--r--win/C#/frmMain.cs5
-rw-r--r--win/C#/frmOptions.Designer.cs3
-rw-r--r--win/C#/frmQueue.cs3
3 files changed, 9 insertions, 2 deletions
diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index e6db91e31..0d052bba2 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -377,7 +377,7 @@ namespace Handbrake
private void mnu_exit_Click(object sender, EventArgs e)
{
- this.Close();
+ Application.Exit();
}
#endregion
@@ -1120,6 +1120,9 @@ namespace Handbrake
case "Lock System":
LockWorkStation();
break;
+ case "Quit HandBrake":
+ Application.Exit();
+ break;
default:
break;
}
diff --git a/win/C#/frmOptions.Designer.cs b/win/C#/frmOptions.Designer.cs
index 13ab0965c..6429a41f4 100644
--- a/win/C#/frmOptions.Designer.cs
+++ b/win/C#/frmOptions.Designer.cs
@@ -256,7 +256,8 @@ namespace Handbrake
"Suspend",
"Hibernate",
"Lock System",
- "Log Off"});
+ "Log Off",
+ "Quit HandBrake"});
this.drp_completeOption.Location = new System.Drawing.Point(223, 29);
this.drp_completeOption.Name = "drp_completeOption";
this.drp_completeOption.Size = new System.Drawing.Size(111, 21);
diff --git a/win/C#/frmQueue.cs b/win/C#/frmQueue.cs
index add7c456f..5d2b7ba2b 100644
--- a/win/C#/frmQueue.cs
+++ b/win/C#/frmQueue.cs
@@ -87,6 +87,9 @@ namespace Handbrake
case "Lock System":
LockWorkStation();
break;
+ case "Quit HandBrake":
+ Application.Exit();
+ break;
default:
break;
}