diff --git a/Artemis/Artemis/ArtemisBootstrapper.cs b/Artemis/Artemis/ArtemisBootstrapper.cs index cc6fd3565..1e3f496d8 100644 --- a/Artemis/Artemis/ArtemisBootstrapper.cs +++ b/Artemis/Artemis/ArtemisBootstrapper.cs @@ -34,7 +34,6 @@ namespace Artemis Initialize(); BindSpecialValues(); - InputHook.Start(); AppDomain.CurrentDomain.UnhandledException += CurrentDomainOnUnhandledException; } @@ -98,6 +97,7 @@ namespace Artemis logger.Info("Artemis was run using the autorun shortcut, sleeping for 15 sec."); Thread.Sleep(15000); } + InputHook.Start(); _kernel = new StandardKernel(new BaseModules(), new ManagerModules()); _kernel.Bind().To().InSingletonScope(); diff --git a/Artemis/Artemis/DeviceProviders/Razer/BlackWidow.cs b/Artemis/Artemis/DeviceProviders/Razer/BlackWidow.cs index bc185fc6c..aff9bfcf7 100644 --- a/Artemis/Artemis/DeviceProviders/Razer/BlackWidow.cs +++ b/Artemis/Artemis/DeviceProviders/Razer/BlackWidow.cs @@ -37,8 +37,11 @@ namespace Artemis.DeviceProviders.Razer return false; // Some people have Synapse installed, but not a Chroma keyboard, deal with this + Chroma.Instance.Initialize(); var blackWidowFound = Chroma.Instance.Query(Devices.Blackwidow).Connected; var blackWidowTeFound = Chroma.Instance.Query(Devices.BlackwidowTe).Connected; + Chroma.Instance.Uninitialize(); + return blackWidowFound || blackWidowTeFound; } diff --git a/Artemis/Artemis/Managers/MainManager.cs b/Artemis/Artemis/Managers/MainManager.cs index 5870984c5..a5965fa73 100644 --- a/Artemis/Artemis/Managers/MainManager.cs +++ b/Artemis/Artemis/Managers/MainManager.cs @@ -108,6 +108,7 @@ namespace Artemis.Managers public async void EnableProgram() { Logger.Debug("Enabling program"); + ProgramEnabled = true; await LoopManager.StartAsync(); @@ -121,9 +122,12 @@ namespace Artemis.Managers public void DisableProgram() { Logger.Debug("Disabling program"); + foreach (var overlayModule in ModuleManager.OverlayModules) + { if (overlayModule.Settings.IsEnabled) overlayModule.Dispose(); + } LoopManager.Stop(); ProgramEnabled = false; RaiseEnabledChangedEvent(new EnabledChangedEventArgs(ProgramEnabled)); @@ -178,4 +182,4 @@ namespace Artemis.Managers handler?.Invoke(this, e); } } -} \ No newline at end of file +}