From f6bdb168a442cd461b7117236c9fe63532f4e29c Mon Sep 17 00:00:00 2001
From: alcexhim <alcexhim@gmail.com>
Date: Fri, 18 Jul 2014 15:20:52 -0400
Subject: [PATCH] Only associate shortcut keys with menu items (to prevent
 conflicts)

---
 .../MainWindow.cs                                              | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/MainWindow.cs b/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/MainWindow.cs
index 69616ebd..2e114bdf 100644
--- a/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/MainWindow.cs
+++ b/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/MainWindow.cs
@@ -140,7 +140,6 @@ namespace UniversalEditor.UserInterface.WindowsForms
 					else
 					{
 						ToolStripMenuItem tsmi = new ToolStripMenuItem();
-						tsmi.ShortcutKeys = ShortcutKeyToWinFormsKeys(cmd.ShortcutKey);
 						tsi = tsmi;
 					}
 
@@ -168,7 +167,6 @@ namespace UniversalEditor.UserInterface.WindowsForms
 					else
 					{
 						tsi = new ToolStripMenuItem();
-						(tsi as ToolStripMenuItem).ShortcutKeys = ShortcutKeyToWinFormsKeys(cmd.ShortcutKey);
 					}
 					tsi.Tag = cmd;
 					tsi.Text = cmd.Title.Replace("_", "&");
@@ -253,6 +251,7 @@ namespace UniversalEditor.UserInterface.WindowsForms
 				tsmi.Click += tsmiCommand_Click;
 				tsmi.Tag = cmd;
 				tsmi.Text = cmd.Title.Replace("_", "&");
+				tsmi.ShortcutKeys = ShortcutKeyToWinFormsKeys(cmd.ShortcutKey);
 				foreach (CommandItem item1 in cmd.Items)
 				{
 					LoadCommandBarMenuItem(item1, tsmi);