From be51677fde86409a4de134e4eaec2507efcaa092 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sun, 22 Feb 2015 20:38:10 +0000 Subject: [PATCH] Remove Global.NullControls --- BizHawk.Client.Common/Global.cs | 1 - BizHawk.Client.EmuHawk/MainForm.cs | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/BizHawk.Client.Common/Global.cs b/BizHawk.Client.Common/Global.cs index 3e9c3e8208..a7bf184556 100644 --- a/BizHawk.Client.Common/Global.cs +++ b/BizHawk.Client.Common/Global.cs @@ -26,7 +26,6 @@ namespace BizHawk.Client.Common /// public static int SoundMaxBufferDeficitMs; - public static Controller NullControls; public static AutofireController AutofireNullControls; //the movie will be spliced inbetween these if it is present diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs index 74e48d7de1..6e7600a123 100644 --- a/BizHawk.Client.EmuHawk/MainForm.cs +++ b/BizHawk.Client.EmuHawk/MainForm.cs @@ -274,7 +274,7 @@ namespace BizHawk.Client.EmuHawk var comm = CreateCoreComm(); CoreFileProvider.SyncCoreCommInputSignals(comm); Global.Emulator = new NullEmulator(comm, Global.Config.GetCoreSettings()); - Global.ActiveController = Global.NullControls; + Global.ActiveController = new Controller(NullEmulator.NullController); Global.AutoFireController = Global.AutofireNullControls; Global.AutofireStickyXORAdapter.SetOnOffPatternFromConfig(); try { GlobalWin.Sound = new Sound(Handle); } @@ -1605,7 +1605,6 @@ namespace BizHawk.Client.EmuHawk } Global.ClientControls = controls; - Global.NullControls = new Controller(NullEmulator.NullController); Global.AutofireNullControls = new AutofireController(NullEmulator.NullController, Global.Emulator); } @@ -3498,7 +3497,7 @@ namespace BizHawk.Client.EmuHawk var coreComm = CreateCoreComm(); CoreFileProvider.SyncCoreCommInputSignals(coreComm); Global.Emulator = new NullEmulator(coreComm, Global.Config.GetCoreSettings()); - Global.ActiveController = Global.NullControls; + Global.ActiveController = new Controller(NullEmulator.NullController); Global.AutoFireController = Global.AutofireNullControls; RewireSound(); RebootStatusBarIcon.Visible = false;