Fix: autofire/autohold hotkeys would sometimes activate buttons that were already being held when the hotkey was pressed.

passes test AutofireHotkeyDoesNotRespondToAlreadyHeldButton

Author: SuuperW

src/BizHawk.Client.Common/controllers/StickyControllers.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Linq;
 
 using BizHawk.Common.CollectionExtensions;
 using BizHawk.Emulation.Common;
@@ -60,16 +59,12 @@ public void ClearStickies()
 			_axisHolds.Clear();
 		}
 
-		private List<string> _justPressed = [ ];
-
 		public void MassToggleStickyState(List<string> buttons)
 		{
-			foreach (var button in buttons.Where(button => !_justPressed.Contains(button)))
+			foreach (var button in buttons)
 			{
 				_ = _buttonHolds.ToggleMembership(button);
 			}
-
-			_justPressed = buttons;
 		}
 	}
 
@@ -158,16 +153,12 @@ public void IncrementLoops(bool lagged)
 			foreach (var v in _axisPatterns.Values) v.GetNextValue(lagged);
 		}
 
-		private List<string> _justPressed = [ ];
-
 		public void MassToggleStickyState(List<string> buttons)
 		{
-			foreach (var button in buttons.Where(button => !_justPressed.Contains(button)))
+			foreach (var button in buttons)
 			{
 				SetButtonAutofire(button, !_boolPatterns.ContainsKey(button));
 			}
-
-			_justPressed = buttons;
 		}
 	}
 }

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

@@ -77,17 +77,6 @@ public void SyncControls(IEmulator emulator, IMovieSession session, Config confi
 			ControllerOutput.Source = session.MovieOut;
 		}
 
-		public void ToggleStickies()
-		{
-			StickyHoldController.MassToggleStickyState(ActiveController.PressedButtons);
-			StickyAutofireController.MassToggleStickyState(AutoFireController.PressedButtons); // does this even make sense?
-		}
-
-		public void ToggleAutoStickies()
-		{
-			StickyAutofireController.MassToggleStickyState(ActiveController.PressedButtons);
-		}
-
 		private static Controller BindToDefinition(
 			ControllerDefinition def,
 			IDictionary<string, Dictionary<string, string>> allBinds,
@@ -233,6 +222,8 @@ public void RunControllerChain(Config config)
 			ClientControls.LatchFromPhysical(_hotkeyCoalescer);
 
 			// controller, which actually has a chain
+			List<string> oldPressedButtons = ActiveController.PressedButtons;
+
 			ActiveController.LatchFromPhysical(ControllerInputCoalescer);
 			ActiveController.OR_FromLogical(ClickyVirtualPadController);
 			AutoFireController.LatchFromPhysical(ControllerInputCoalescer);
@@ -242,13 +233,25 @@ public void RunControllerChain(Config config)
 				ActiveController.ApplyAxisConstraints("Natural Circle");
 			}
 
-			if (ClientControls["Autohold"])
-			{
-				ToggleStickies();
-			}
-			else if (ClientControls["Autofire"])
+			if (ClientControls["Autohold"] || ClientControls["Autofire"])
 			{
-				ToggleAutoStickies();
+				List<string> newPressedButtons = ActiveController.PressedButtons;
+				List<string> justPressedButtons = new();
+				foreach (string button in newPressedButtons)
+				{
+					if (!oldPressedButtons.Contains(button)) justPressedButtons.Add(button);
+				}
+				if (justPressedButtons.Count != 0)
+				{
+					if (ClientControls["Autohold"])
+					{
+						StickyHoldController.MassToggleStickyState(justPressedButtons);
+					}
+					else
+					{
+						StickyAutofireController.MassToggleStickyState(justPressedButtons);
+					}
+				}
 			}
 
 			// autohold/autofire must not be affected by the following inputs