summaryrefslogtreecommitdiffstats
path: root/win/C#
diff options
context:
space:
mode:
authorsr55 <[email protected]>2010-08-15 19:52:11 +0000
committersr55 <[email protected]>2010-08-15 19:52:11 +0000
commit51c4a7cf0e7107753cb8c9d3ab1d2e0c19b45eca (patch)
treede3559d1e814db09d312fc58fe24b6b2bf8212fb /win/C#
parent45cbc5f31a333bcef3c48f6572fb2af3c59a1f0b (diff)
WinGui:
- Fix for "del" key deleting items from the queue when additional modifier keys were pressed. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3479 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/C#')
-rw-r--r--win/C#/frmQueue.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/win/C#/frmQueue.cs b/win/C#/frmQueue.cs
index e4c5089f9..eedc10909 100644
--- a/win/C#/frmQueue.cs
+++ b/win/C#/frmQueue.cs
@@ -507,7 +507,7 @@ namespace Handbrake
/// </param>
private void ListQueueDeleteKey(object sender, KeyEventArgs e)
{
- if (e.KeyCode == Keys.Delete)
+ if (e.KeyCode == Keys.Delete && e.Modifiers == Keys.None)
DeleteSelectedItems();
}
@@ -665,7 +665,7 @@ namespace Handbrake
/// </param>
private void MnuReaddClick(object sender, EventArgs e)
{
- if (!queue.LastEncode.IsEmpty)
+ if (queue.LastEncode != null && !queue.LastEncode.IsEmpty)
{
queue.Add(
queue.LastEncode.Query,