Merge pull request #1486 from ts-korhonen/master

Fix Alt-F4 closing SDL renderer window.
2021-06-15 17:20:55 +02:00
parent 6bd2ba28ce 7941659ad0
commit 79e26765e7
1 changed files with 9 additions and 1 deletions
--- a/src/win/win_ui.c
+++ b/src/win/win_ui.c
@@ -1533,7 +1533,15 @@ ui_init(int nCmdShow)
 		break;
 	}

-	if (! TranslateAccelerator(hwnd, haccel, &messages)) {
+	if (! TranslateAccelerator(hwnd, haccel, &messages))
+	{
+		/* Don't process other keypresses. */
+		if (messages.message == WM_SYSKEYDOWN ||
+			messages.message == WM_SYSKEYUP ||
+			messages.message == WM_KEYDOWN ||
+			messages.message == WM_KEYUP)
+			continue;
+
                TranslateMessage(&messages);
                DispatchMessage(&messages);
 	}