Fix issue WinMerge#2592: ALT-F4 opens Tools menu instead of exit from…

… WinMerge
pipeline-foundation · Dec 29, 2024 · e558227 · e558227
1 parent ceb6311
commit e558227
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/Src/MenuBar.cpp b/Src/MenuBar.cpp
@@ -398,7 +398,9 @@ BOOL CMenuBar::PreTranslateMessage(MSG* pMsg)
 			return TRUE;
 		}
 		UINT uId = 0;
-		if ((pMsg->message == WM_SYSKEYDOWN) && GetToolBarCtrl().MapAccelerator(static_cast<TCHAR>(pMsg->wParam), &uId) != 0)
+		const TCHAR key = static_cast<TCHAR>(pMsg->wParam);
+		const bool alnum = (key >= '0' && key <= '9') || (key >= 'A' && key <= 'Z');
+		if ((pMsg->message == WM_SYSKEYDOWN) && alnum && GetToolBarCtrl().MapAccelerator(key, &uId) != 0)
 		{
 			ShowKeyboardCues(true);
 			OnMenuBarMenuItem(uId);