Fix Alt+F4 hotkey mistakenly triggered from other windows

yfdyh000 · Apr 8, 2022 · f717da3 · f717da3
1 parent 82d8f64
commit f717da3
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/PhotoSift/frmMain_Input.cs b/PhotoSift/frmMain_Input.cs
@@ -36,6 +36,7 @@ namespace PhotoSift
     /// </summary>
     public partial class frmMain : Form
 	{
+		private static bool isAltF4Down;
 
 		// -- Handle Menu Items -------------------------------------------------------------------------------------
 
@@ -746,7 +747,8 @@ private void frmMain_KeyUp( object sender, KeyEventArgs e )
 			}
 #endif
 
-			if (e.Modifiers == (Keys.Alt) && e.KeyCode == Keys.F4) mnuExit_Click(sender, e); // Workaround for WMP control
+			if (e.Modifiers == (Keys.Alt) && e.KeyCode == Keys.F4 && isAltF4Down) mnuExit_Click(sender, e); // Workaround for WMP control
+			isAltF4Down = false;
 
 			// Control/Shift/Alt are not used below so skip the rest
 			if ( e.Alt || e.Control || e.Shift ) return;
@@ -957,6 +959,8 @@ private void frmMain_KeyDown( object sender, KeyEventArgs e )
 				e.Handled = true;
 			}
 
+			if (e.Modifiers == (Keys.Alt) && e.KeyCode == Keys.F4) isAltF4Down = true;
+
 			// keyboard zoom (handled in keydown event to allow for key repeats)
 			else if( e.KeyCode == Keys.Add || e.KeyCode == Keys.Subtract || e.KeyCode == Keys.Oemplus || e.KeyCode == Keys.OemMinus )
 			{