From 2ea920dc7a51df05a2d1cc909fcd01f6fa78755a Mon Sep 17 00:00:00 2001 From: RKrom Date: Fri, 23 Nov 2012 15:47:37 +0000 Subject: [PATCH] Fixed potential error. git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2303 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4 --- Greenshot/Forms/ImageEditorForm.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Greenshot/Forms/ImageEditorForm.cs b/Greenshot/Forms/ImageEditorForm.cs index a69ef321a..0ee3df210 100644 --- a/Greenshot/Forms/ImageEditorForm.cs +++ b/Greenshot/Forms/ImageEditorForm.cs @@ -229,6 +229,7 @@ namespace Greenshot { ToolStripMenuItem defaultItem = new ToolStripMenuItem(toolstripDestination.Description); defaultItem.Tag = toolstripDestination; defaultItem.Image = toolstripDestination.DisplayIcon; + defaultItem.ShortcutKeys = Keys.None; defaultItem.Click += delegate { toolstripDestination.ExportCapture(true, surface, surface.CaptureDetails); }; @@ -307,8 +308,8 @@ namespace Greenshot { } ToolStripMenuItem item = destination.GetMenuItem(true, new EventHandler(DestinationToolStripMenuItemClick)); - item.ShortcutKeys = destination.EditorShortcutKeys; if (item != null) { + item.ShortcutKeys = destination.EditorShortcutKeys; fileStripMenuItem.DropDownItems.Add(item); } }