Fix: Input overrides hotkeys did not work if both input and hotkey were bound to a combination such as Shift+A.

passes test ControllerPriorityWithModifier

Author: SuuperW

src/BizHawk.Client.Common/Controller.cs

@@ -59,11 +59,20 @@ public bool AnyInputHeld
 		public List<string> SearchBindings(string button)
 			=> _bindings.Where(b => b.Value.Contains(button)).Select(static b => b.Key).ToList();
 
-		// Searches bindings for the controller and returns true if this binding is mapped somewhere in this controller
-		public bool HasBinding(string button) =>
-			_bindings
+		/// <summary>
+		/// Checks if the given button combination would be a controller input.
+		/// This means Shift+A will return true if an input is bound to either A or Shift+A.
+		/// </summary>
+		public bool HasBinding(string button)
+		{
+			string[] buttons = button.Split('+');
+			return _bindings
 				.SelectMany(kvp => kvp.Value)
-				.Any(boundButton => boundButton == button);
+				.Any((boundCombination) => {
+					string[] boundButtons = boundCombination.Split('+');
+					return boundButtons.All((b) => buttons.Contains(b));
+				});
+		}
 
 		/// <summary>
 		/// uses the bindings to latch our own logical button state from the source controller's button state (which are assumed to be the physical side of the binding).

src/BizHawk.Client.Common/inputAdapters/InputManager.cs

@@ -167,7 +167,7 @@ public void ProcessInput(IInputSource source, Func<string, bool> processHotkey,
 				// TODO - wonder what happens if we pop up something interactive as a response to one of these hotkeys? may need to purge further processing
 
 				var hotkeyTriggers = ClientControls.SearchBindings(ie.LogicalButton.ToString());
-				bool isEmuInput = ie.LogicalButton.ToString().Split('+').Any(ActiveController.HasBinding);
+				bool isEmuInput = ActiveController.HasBinding(ie.LogicalButton.ToString());
 
 				bool shouldDoHotkey = config.InputHotkeyOverrideOptions != 1;
 				bool shouldDoEmuInput = config.InputHotkeyOverrideOptions != 2;