From 17733e38f7595025290beb75bfe2dddefbd2125b Mon Sep 17 00:00:00 2001
From: Morilli <35152647+Morilli@users.noreply.github.com>
Date: Thu, 22 Aug 2024 13:32:30 +0200
Subject: [PATCH] Check all individual buttons with input key priority

- closes #3842

If any of the pressed buttons is an input, don't trigger any hotkeys.
---
 src/BizHawk.Client.EmuHawk/MainForm.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs
index d06d0811bf..1239dc75b4 100644
--- a/src/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/src/BizHawk.Client.EmuHawk/MainForm.cs
@@ -1200,7 +1200,8 @@ namespace BizHawk.Client.EmuHawk
 						break;
 					case 1: // Input overrides Hotkeys
 						finalHostController.Receive(ie);
-						if (!activeControllerHasBinding(ie.LogicalButton.ToString()))
+						// don't check hotkeys when any of the pressed keys are input
+						if (!ie.LogicalButton.ToString().Split('+').Any(activeControllerHasBinding))
 						{
 							handled = false;
 							if (ie.EventType is InputEventType.Press)