diff --git a/src/BizHawk.Client.EmuHawk/GlobalWin.cs b/src/BizHawk.Client.EmuHawk/GlobalWin.cs index b069b587a7..6731124c9a 100644 --- a/src/BizHawk.Client.EmuHawk/GlobalWin.cs +++ b/src/BizHawk.Client.EmuHawk/GlobalWin.cs @@ -15,7 +15,5 @@ namespace BizHawk.Client.EmuHawk public static Config Config { get; set; } public static IMovieSession MovieSession => _mainForm.MovieSession; - - public static InputManager InputManager { get; } = new InputManager(); } } diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs index 66a458101a..75c3cb0188 100644 --- a/src/BizHawk.Client.EmuHawk/MainForm.cs +++ b/src/BizHawk.Client.EmuHawk/MainForm.cs @@ -284,7 +284,7 @@ namespace BizHawk.Client.EmuHawk _config = config; // skips assignment to GlobalWin.Config as Program already did that GL = gl; - InputManager.ControllerInputCoalescer = new ControllerInputCoalescer(); + InputManager = new InputManager { ControllerInputCoalescer = new ControllerInputCoalescer() }; FirmwareManager = new FirmwareManager(); MovieSession = new MovieSession( Config.Movies, @@ -849,7 +849,7 @@ namespace BizHawk.Client.EmuHawk public EmuClientApi EmuClient { get; set; } - private InputManager InputManager => GlobalWin.InputManager; + private readonly InputManager InputManager; private IVideoProvider _currentVideoProvider = NullVideo.Instance;