Merge pull request elfmz#2437 from unxed/numfix

wxGetKeyState() fails to return correct Alt state under X11 in some cases
akruphi · Oct 20, 2024 · df4feaf · df4feaf
2 parents a464fb8 + 9156f38
commit df4feaf
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/WinPort/src/Backend/WX/wxMain.cpp b/WinPort/src/Backend/WX/wxMain.cpp
@@ -1304,7 +1304,7 @@ void WinPortPanel::OnKeyDown( wxKeyEvent& event )
 	// also it didnt cause problems yet
 	if ( (_key_tracker.Shift() && !event.ShiftDown())
 		|| ((_key_tracker.LeftControl() || _key_tracker.RightControl()) && !event.ControlDown())) {
-		if (_key_tracker.CheckForSuddenModifiersUp()) {
+		if ((!_key_tracker.Alt() || g_wayland) && _key_tracker.CheckForSuddenModifiersUp()) {
 			_exclusive_hotkeys.Reset();
 		}
 	}
@@ -1438,7 +1438,7 @@ void WinPortPanel::OnKeyUp( wxKeyEvent& event )
 #endif
 		wxConsoleInputShim::Enqueue(&ir, 1);
 	}
-	if (_key_tracker.CheckForSuddenModifiersUp()) {
+	if ((!_key_tracker.Alt() || g_wayland) && _key_tracker.CheckForSuddenModifiersUp()) {
 		_exclusive_hotkeys.Reset();
 	}
 	//event.Skip();