From eefc5630f31361066f9fff3bb45167773466f7df Mon Sep 17 00:00:00 2001 From: Robert Date: Sun, 28 Feb 2021 17:15:28 +0100 Subject: [PATCH] Core - Don't disable already disabled plugins on dispose --- src/Artemis.Core/Plugins/DeviceProviders/DeviceProvider.cs | 6 ------ src/Artemis.Core/Plugins/PluginFeature.cs | 3 ++- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/Artemis.Core/Plugins/DeviceProviders/DeviceProvider.cs b/src/Artemis.Core/Plugins/DeviceProviders/DeviceProvider.cs index dd3d7ad5b..949065503 100644 --- a/src/Artemis.Core/Plugins/DeviceProviders/DeviceProvider.cs +++ b/src/Artemis.Core/Plugins/DeviceProviders/DeviceProvider.cs @@ -51,12 +51,6 @@ namespace Artemis.Core.DeviceProviders /// public bool CanDetectLogicalLayout { get; protected set; } - /// - public override void Disable() - { - // Does not happen with device providers, they require Artemis to restart - } - /// /// Loads a layout for the specified device and wraps it in an /// diff --git a/src/Artemis.Core/Plugins/PluginFeature.cs b/src/Artemis.Core/Plugins/PluginFeature.cs index b0e08554f..1eadf61aa 100644 --- a/src/Artemis.Core/Plugins/PluginFeature.cs +++ b/src/Artemis.Core/Plugins/PluginFeature.cs @@ -129,7 +129,8 @@ namespace Artemis.Core internal virtual void InternalDisable() { - Disable(); + if (IsEnabled) + Disable(); } #region IDisposable