From 0f681de5312b16532a28690ac290268ca994d9e6 Mon Sep 17 00:00:00 2001 From: tomcw Date: Sun, 26 Jan 2020 11:57:40 +0000 Subject: [PATCH] Fixed regression for CTRL+ALT+BREAK (where ALT wasn't recognised). (Fixes #752) --- source/Frame.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/source/Frame.cpp b/source/Frame.cpp index 4d7d2857..497af9a7 100644 --- a/source/Frame.cpp +++ b/source/Frame.cpp @@ -1420,7 +1420,6 @@ LRESULT CALLBACK FrameWndProc ( LogOutput("WM_KEYDOWN: %08X (scanCode=%04X)\n", wparam, (lparam>>16)&0xfff); #endif if (!IsJoyKey && - !KeybGetAltStatus() && // GH#749 - AltGr also fakes CTRL being pressed! (g_nAppMode != MODE_LOGO)) // !MODE_LOGO - not emulating so don't pass to the VM's keyboard { // GH#678 Alternate key(s) to toggle max speed @@ -1428,7 +1427,9 @@ LRESULT CALLBACK FrameWndProc ( // . Ctrl-1: Speed = 1 MHz // . Ctrl-3: Speed = Full-Speed bool keyHandled = false; - if( KeybGetCtrlStatus() && wparam >= '0' && wparam <= '9' ) + if( KeybGetCtrlStatus() && + !KeybGetAltStatus() && // GH#749 - AltGr also fakes CTRL being pressed! + wparam >= '0' && wparam <= '9' ) { switch (wparam) {