fixed: cursor changed to drag mode when pressing hotkey

- stoped the checkMenuShortcut for loop
d2phap · Apr 18, 2018 · 493f280 · 493f280
1 parent c96d454
commit 493f280
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/Source/ImageGlass/frmMain.cs b/Source/ImageGlass/frmMain.cs
@@ -507,6 +507,8 @@ private void NextPic(int step, bool isKeepZoomRatio, bool isSkippingCache = fals
                 LocalSetting.ImageModifiedPath = "";
             }
 
+            _isDraggingImage = false;
+
             //Select thumbnail item
             SelectCurrentThumbnail();
 
@@ -569,7 +571,7 @@ private void frmMain_KeyDown(object sender, KeyEventArgs e)
             //this.Text = e.KeyValue.ToString();
 
             #region Register MAIN MENU shortcuts
-            void checkMenuShortcut(ToolStripMenuItem mnu)
+            bool checkMenuShortcut(ToolStripMenuItem mnu)
             {
                 Keys pressed = e.KeyCode;
                 if (e.Control) pressed = pressed | Keys.Control;
@@ -579,17 +581,23 @@ void checkMenuShortcut(ToolStripMenuItem mnu)
                 if (mnu.ShortcutKeys == pressed)
                 {
                     mnu.PerformClick();
+                    return true;
                 }
                 foreach (ToolStripMenuItem child in mnu.DropDownItems.OfType<ToolStripMenuItem>())
                 {
                     checkMenuShortcut(child);
                 }
+
+                return false;
             }
 
             //register context menu shortcuts
             foreach (ToolStripMenuItem item in mnuMain.Items.OfType<ToolStripMenuItem>())
             {
-                checkMenuShortcut(item);
+                if (checkMenuShortcut(item))
+                {
+                    return;
+                }
             }
             #endregion