From 447ae737f38b5b815b0ff1cb4d2f7a0e0100dddb Mon Sep 17 00:00:00 2001 From: zeromus Date: Thu, 15 Oct 2020 13:29:53 -0400 Subject: [PATCH] * don't clear ControllerInputCoalescer when rewiring input. it just collects physical input, there is no reason to unpress it. if you're holding a button, you want it held. the only exceptions would be in case a hotkey and controller input collided, in which case a prior hotkey press (which caused a rom to open or close) would then get handled as a controller input. this could be solved in some other way, probably (unpress hotkeys as soon as received?) * resync controls after CloseRom fixes #2453 --- src/BizHawk.Client.Common/inputAdapters/InputManager.cs | 1 - src/BizHawk.Client.EmuHawk/MainForm.cs | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BizHawk.Client.Common/inputAdapters/InputManager.cs b/src/BizHawk.Client.Common/inputAdapters/InputManager.cs index 2a237a4045..56432ac531 100644 --- a/src/BizHawk.Client.Common/inputAdapters/InputManager.cs +++ b/src/BizHawk.Client.Common/inputAdapters/InputManager.cs @@ -57,7 +57,6 @@ namespace BizHawk.Client.Common ClickyVirtualPadController.Definition = new ControllerDefinition(def); // Wire up input chain - ControllerInputCoalescer.Clear(); ControllerInputCoalescer.Definition = ActiveController.Definition; UdLRControllerAdapter.Source = ActiveController.Or(AutoFireController); diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs index b99b4f3733..12d1130da5 100644 --- a/src/BizHawk.Client.EmuHawk/MainForm.cs +++ b/src/BizHawk.Client.EmuHawk/MainForm.cs @@ -3900,6 +3900,7 @@ namespace BizHawk.Client.EmuHawk Tools.Restart(Emulator, Game); RewireSound(); ClearHolds(); + InputManager.SyncControls(Emulator, MovieSession, Config); Tools.UpdateCheatRelatedTools(null, null); PauseOnFrame = null; CurrentlyOpenRom = null;