Merge pull request #336 from DarthAffe/ProviderInit

Improved DeviceProviders

RGB.NET.Core/Devices/AbstractRGBDeviceProvider.cs

@@ -12,6 +12,8 @@ public abstract class AbstractRGBDeviceProvider : IRGBDeviceProvider
 {
     #region Properties & Fields
 
+    private bool _isDisposed = false;
+
     private readonly double _defaultUpdateRateHardLimit;
 
     /// <inheritdoc />
@@ -60,6 +62,8 @@ public abstract class AbstractRGBDeviceProvider : IRGBDeviceProvider
         this._defaultUpdateRateHardLimit = defaultUpdateRateHardLimit;
     }
 
+    ~AbstractRGBDeviceProvider() => Dispose(false);
+
     #endregion
 
     #region Methods
@@ -67,6 +71,8 @@ public abstract class AbstractRGBDeviceProvider : IRGBDeviceProvider
     /// <inheritdoc />
     public bool Initialize(RGBDeviceType loadFilter = RGBDeviceType.All, bool throwExceptions = false)
     {
+        if (_isDisposed) throw new ObjectDisposedException(GetType().FullName);
+
         ThrowsExceptions = throwExceptions;
 
         try
@@ -108,6 +114,8 @@ public abstract class AbstractRGBDeviceProvider : IRGBDeviceProvider
     /// <returns>The filtered collection of loaded devices.</returns>
     protected virtual IEnumerable<IRGBDevice> GetLoadedDevices(RGBDeviceType loadFilter)
     {
+        if (_isDisposed) throw new ObjectDisposedException(GetType().FullName);
+
         List<IRGBDevice> devices = new();
         foreach (IRGBDevice device in LoadDevices())
         {
@@ -152,6 +160,8 @@ public abstract class AbstractRGBDeviceProvider : IRGBDeviceProvider
     /// <returns>The update trigger mapped to the specified id.</returns>
     protected virtual IDeviceUpdateTrigger GetUpdateTrigger(int id = -1, double? updateRateHardLimit = null)
     {
+        if (_isDisposed) throw new ObjectDisposedException(GetType().FullName);
+
         if (!UpdateTriggerMapping.TryGetValue(id, out IDeviceUpdateTrigger? updaeTrigger))
             UpdateTriggerMapping[id] = (updaeTrigger = CreateUpdateTrigger(id, updateRateHardLimit ?? _defaultUpdateRateHardLimit));
 
@@ -171,6 +181,8 @@ public abstract class AbstractRGBDeviceProvider : IRGBDeviceProvider
     /// </summary>
     protected virtual void Reset()
     {
+        if (_isDisposed) throw new ObjectDisposedException(GetType().FullName);
+
         foreach (IDeviceUpdateTrigger updateTrigger in UpdateTriggerMapping.Values)
             updateTrigger.Dispose();
 
@@ -192,6 +204,8 @@ public abstract class AbstractRGBDeviceProvider : IRGBDeviceProvider
     /// <returns><c>true</c> if the device was added successfully; otherwise <c>false</c>.</returns>
     protected virtual bool AddDevice(IRGBDevice device)
     {
+        if (_isDisposed) throw new ObjectDisposedException(GetType().FullName);
+
         if (InternalDevices.Contains(device)) return false;
 
         InternalDevices.Add(device);
@@ -207,6 +221,8 @@ public abstract class AbstractRGBDeviceProvider : IRGBDeviceProvider
     /// <returns><c>true</c> if the device was removed successfully; otherwise <c>false</c>.</returns>
     protected virtual bool RemoveDevice(IRGBDevice device)
     {
+        if (_isDisposed) throw new ObjectDisposedException(GetType().FullName);
+
         if (!InternalDevices.Remove(device)) return false;
 
         try { OnDevicesChanged(DevicesChangedEventArgs.CreateDevicesRemovedArgs(device)); } catch { /* we don't want to throw due to bad event handlers */ }
@@ -241,12 +257,26 @@ public abstract class AbstractRGBDeviceProvider : IRGBDeviceProvider
     protected virtual void OnDevicesChanged(DevicesChangedEventArgs args) => DevicesChanged?.Invoke(this, args);
 
     /// <inheritdoc />
-    public virtual void Dispose()
+    public void Dispose()
     {
-        Reset();
+        if (_isDisposed) return;
+
+        try
+        {
+            Dispose(true);
+        }
+        catch { /* don't throw in dispose! */ }
 
         GC.SuppressFinalize(this);
+
+        _isDisposed = true;
     }
 
+    /// <summary>
+    /// Disposes the object and frees all resources.
+    /// </summary>
+    /// <param name="disposing"><c>true</c> if explicitely called through the Dispose-Method, <c>false</c> if called by the destructor.</param>
+    protected virtual void Dispose(bool disposing) => Reset();
+
     #endregion
 }

RGB.NET.Devices.Asus/AsusDeviceProvider.cs

@@ -16,11 +16,21 @@ public sealed class AsusDeviceProvider : AbstractRGBDeviceProvider
 {
     #region Properties & Fields
 
+    // ReSharper disable once InconsistentNaming
+    private static readonly object _lock = new();
+
     private static AsusDeviceProvider? _instance;
     /// <summary>
     /// Gets the singleton <see cref="AsusDeviceProvider"/> instance.
     /// </summary>
-    public static AsusDeviceProvider Instance => _instance ?? new AsusDeviceProvider();
+    public static AsusDeviceProvider Instance
+    {
+        get
+        {
+            lock (_lock)
+                return _instance ?? new AsusDeviceProvider();
+        }
+    }
 
     private IAuraSdk2? _sdk;
     private IAuraSyncDeviceCollection? _devices; //HACK DarthAffe 05.04.2021: Due to some researches this might fix the access violation in the asus-sdk
@@ -34,10 +44,13 @@ public sealed class AsusDeviceProvider : AbstractRGBDeviceProvider
     /// </summary>
     /// <exception cref="InvalidOperationException">Thrown if this constructor is called even if there is already an instance of this class.</exception>
     public AsusDeviceProvider()
+    {
+        lock (_lock)
         {
             if (_instance != null) throw new InvalidOperationException($"There can be only one instance of type {nameof(AsusDeviceProvider)}");
             _instance = this;
         }
+    }
 
     #endregion
 
@@ -80,15 +93,19 @@ public sealed class AsusDeviceProvider : AbstractRGBDeviceProvider
     }
 
     /// <inheritdoc />
-    public override void Dispose()
+    protected override void Dispose(bool disposing)
     {
-        base.Dispose();
+        lock (_lock)
+        {
+            base.Dispose(disposing);
 
             try { _sdk?.ReleaseControl(0); }
             catch { /* at least we tried */ }
 
             _devices = null;
             _sdk = null;
+            _instance = null;
+        }
     }
 
     #endregion

RGB.NET.Devices.CoolerMaster/CoolerMasterDeviceProvider.cs

@@ -17,11 +17,21 @@ public sealed class CoolerMasterDeviceProvider : AbstractRGBDeviceProvider
 {
     #region Properties & Fields
 
+    // ReSharper disable once InconsistentNaming
+    private static readonly object _lock = new();
+
     private static CoolerMasterDeviceProvider? _instance;
     /// <summary>
     /// Gets the singleton <see cref="CoolerMasterDeviceProvider"/> instance.
     /// </summary>
-    public static CoolerMasterDeviceProvider Instance => _instance ?? new CoolerMasterDeviceProvider();
+    public static CoolerMasterDeviceProvider Instance
+    {
+        get
+        {
+            lock (_lock)
+                return _instance ?? new CoolerMasterDeviceProvider();
+        }
+    }
 
     /// <summary>
     /// Gets a modifiable list of paths used to find the native SDK-dlls for x86 applications.
@@ -44,10 +54,13 @@ public sealed class CoolerMasterDeviceProvider : AbstractRGBDeviceProvider
     /// </summary>
     /// <exception cref="InvalidOperationException">Thrown if this constructor is called even if there is already an instance of this class.</exception>
     public CoolerMasterDeviceProvider()
+    {
+        lock (_lock)
         {
             if (_instance != null) throw new InvalidOperationException($"There can be only one instance of type {nameof(CoolerMasterDeviceProvider)}");
             _instance = this;
         }
+    }
 
     #endregion
 
@@ -94,12 +107,17 @@ public sealed class CoolerMasterDeviceProvider : AbstractRGBDeviceProvider
     }
 
     /// <inheritdoc />
-    public override void Dispose()
+    protected override void Dispose(bool disposing)
     {
-        base.Dispose();
+        lock (_lock)
+        {
+            base.Dispose(disposing);
 
             try { _CoolerMasterSDK.Reload(); }
             catch { /* Unlucky.. */ }
+
+            _instance = null;
+        }
     }
 
     #endregion

RGB.NET.Devices.Corsair/CorsairDeviceProvider.cs

@@ -17,11 +17,21 @@ public sealed class CorsairDeviceProvider : AbstractRGBDeviceProvider
 {
     #region Properties & Fields
 
+    // ReSharper disable once InconsistentNaming
+    private static readonly object _lock = new();
+
     private static CorsairDeviceProvider? _instance;
     /// <summary>
     /// Gets the singleton <see cref="CorsairDeviceProvider"/> instance.
     /// </summary>
-    public static CorsairDeviceProvider Instance => _instance ?? new CorsairDeviceProvider();
+    public static CorsairDeviceProvider Instance
+    {
+        get
+        {
+            lock (_lock)
+                return _instance ?? new CorsairDeviceProvider();
+        }
+    }
 
     /// <summary>
     /// Gets a modifiable list of paths used to find the native SDK-dlls for x86 applications.
@@ -79,10 +89,13 @@ public sealed class CorsairDeviceProvider : AbstractRGBDeviceProvider
     /// </summary>
     /// <exception cref="InvalidOperationException">Thrown if this constructor is called even if there is already an instance of this class.</exception>
     public CorsairDeviceProvider()
+    {
+        lock (_lock)
         {
             if (_instance != null) throw new InvalidOperationException($"There can be only one instance of type {nameof(CorsairDeviceProvider)}");
             _instance = this;
         }
+    }
 
     #endregion
 
@@ -300,12 +313,20 @@ public sealed class CorsairDeviceProvider : AbstractRGBDeviceProvider
     }
 
     /// <inheritdoc />
-    public override void Dispose()
+    protected override void Dispose(bool disposing)
     {
-        base.Dispose();
+        lock (_lock)
+        {
+            base.Dispose(disposing);
 
-        try { _CUESDK.CorsairDisconnect(); } catch { /* at least we tried */ }
+            try { _CUESDK.CorsairDisconnect(); }
-        try { _CUESDK.UnloadCUESDK(); } catch { /* at least we tried */ }
+            catch { /* at least we tried */ }
+
+            try { _CUESDK.UnloadCUESDK(); }
+            catch { /* at least we tried */ }
+
+            _instance = null;
+        }
     }
 
     #endregion

RGB.NET.Devices.DMX/DMXDeviceProvider.cs

@@ -16,11 +16,21 @@ public sealed class DMXDeviceProvider : AbstractRGBDeviceProvider
 {
     #region Properties & Fields
 
+    // ReSharper disable once InconsistentNaming
+    private static readonly object _lock = new();
+
     private static DMXDeviceProvider? _instance;
     /// <summary>
     /// Gets the singleton <see cref="DMXDeviceProvider"/> instance.
     /// </summary>
-    public static DMXDeviceProvider Instance => _instance ?? new DMXDeviceProvider();
+    public static DMXDeviceProvider Instance
+    {
+        get
+        {
+            lock (_lock)
+                return _instance ?? new DMXDeviceProvider();
+        }
+    }
 
     /// <summary>
     /// Gets a list of all defined device-definitions.
@@ -36,10 +46,13 @@ public sealed class DMXDeviceProvider : AbstractRGBDeviceProvider
     /// </summary>
     /// <exception cref="InvalidOperationException">Thrown if this constructor is called even if there is already an instance of this class.</exception>
     public DMXDeviceProvider()
+    {
+        lock (_lock)
         {
             if (_instance != null) throw new InvalidOperationException($"There can be only one instance of type {nameof(DMXDeviceProvider)}");
             _instance = this;
         }
+    }
 
     #endregion
 
@@ -86,5 +99,16 @@ public sealed class DMXDeviceProvider : AbstractRGBDeviceProvider
         return updateTrigger;
     }
 
+    /// <inheritdoc />
+    protected override void Dispose(bool disposing)
+    {
+        lock (_lock)
+        {
+            base.Dispose(disposing);
+
+            _instance = null;
+        }
+    }
+
     #endregion
 }

RGB.NET.Devices.Debug/DebugDeviceProvider.cs

@@ -16,11 +16,21 @@ public sealed class DebugDeviceProvider : AbstractRGBDeviceProvider
 {
     #region Properties & Fields
 
+    // ReSharper disable once InconsistentNaming
+    private static readonly object _lock = new();
+
     private static DebugDeviceProvider? _instance;
     /// <summary>
     /// Gets the singleton <see cref="DebugDeviceProvider"/> instance.
     /// </summary>
-    public static DebugDeviceProvider Instance => _instance ?? new DebugDeviceProvider();
+    public static DebugDeviceProvider Instance
+    {
+        get
+        {
+            lock (_lock)
+                return _instance ?? new DebugDeviceProvider();
+        }
+    }
 
     private List<(IDeviceLayout layout, Action<IEnumerable<Led>>? updateLedsAction)> _fakeDeviceDefinitions = new();
 
@@ -33,10 +43,13 @@ public sealed class DebugDeviceProvider : AbstractRGBDeviceProvider
     /// </summary>
     /// <exception cref="InvalidOperationException">Thrown if this constructor is called even if there is already an instance of this class.</exception>
     public DebugDeviceProvider()
+    {
+        lock (_lock)
         {
             if (_instance != null) throw new InvalidOperationException($"There can be only one instance of type {nameof(DebugDeviceProvider)}");
             _instance = this;
         }
+    }
 
     #endregion
 
@@ -66,11 +79,16 @@ public sealed class DebugDeviceProvider : AbstractRGBDeviceProvider
     }
 
     /// <inheritdoc />
-    public override void Dispose()
+    protected override void Dispose(bool disposing)
     {
-        base.Dispose();
+        lock (_lock)
+        {
+            base.Dispose(disposing);
 
             _fakeDeviceDefinitions.Clear();
+
+            _instance = null;
+        }
     }
 
     #endregion

RGB.NET.Devices.Logitech/LogitechDeviceProvider.cs

@@ -20,11 +20,21 @@ public class LogitechDeviceProvider : AbstractRGBDeviceProvider
 {
     #region Properties & Fields
 
+    // ReSharper disable once InconsistentNaming
+    private static readonly object _lock = new();
+
     private static LogitechDeviceProvider? _instance;
     /// <summary>
     /// Gets the singleton <see cref="LogitechDeviceProvider"/> instance.
     /// </summary>
-    public static LogitechDeviceProvider Instance => _instance ?? new LogitechDeviceProvider();
+    public static LogitechDeviceProvider Instance
+    {
+        get
+        {
+            lock (_lock)
+                return _instance ?? new LogitechDeviceProvider();
+        }
+    }
 
     /// <summary>
     /// Gets a modifiable list of paths used to find the native SDK-dlls for x86 applications.
@@ -164,9 +174,13 @@ public class LogitechDeviceProvider : AbstractRGBDeviceProvider
     /// <exception cref="InvalidOperationException">Thrown if this constructor is called even if there is already an instance of this class.</exception>
     public LogitechDeviceProvider()
     {
-        if (_instance != null) throw new InvalidOperationException($"There can be only one instance of type {nameof(LogitechDeviceProvider)}");
+        lock (_lock)
+        {
+            if (_instance != null)
+                throw new InvalidOperationException($"There can be only one instance of type {nameof(LogitechDeviceProvider)}");
             _instance = this;
         }
+    }
 
     #endregion
 
@@ -254,9 +268,11 @@ public class LogitechDeviceProvider : AbstractRGBDeviceProvider
     }
 
     /// <inheritdoc />
-    public override void Dispose()
+    protected override void Dispose(bool disposing)
     {
-        base.Dispose();
+        lock (_lock)
+        {
+            base.Dispose(disposing);
 
             try { _LogitechGSDK.LogiLedRestoreLighting(); }
             catch { /* at least we tried */ }
@@ -264,7 +280,8 @@ public class LogitechDeviceProvider : AbstractRGBDeviceProvider
             try { _LogitechGSDK.UnloadLogitechGSDK(); }
             catch { /* at least we tried */ }
 
-        GC.SuppressFinalize(this);
+            _instance = null;
+        }
     }
 
     #endregion

RGB.NET.Devices.Msi/MsiDeviceProvider.cs

@@ -17,11 +17,21 @@ public class MsiDeviceProvider : AbstractRGBDeviceProvider
 {
     #region Properties & Fields
 
+    // ReSharper disable once InconsistentNaming
+    private static readonly object _lock = new();
+
     private static MsiDeviceProvider? _instance;
     /// <summary>
     /// Gets the singleton <see cref="MsiDeviceProvider"/> instance.
     /// </summary>
-    public static MsiDeviceProvider Instance => _instance ?? new MsiDeviceProvider();
+    public static MsiDeviceProvider Instance
+    {
+        get
+        {
+            lock (_lock)
+                return _instance ?? new MsiDeviceProvider();
+        }
+    }
 
     /// <summary>
     /// Gets a modifiable list of paths used to find the native SDK-dlls for x86 applications.
@@ -44,10 +54,13 @@ public class MsiDeviceProvider : AbstractRGBDeviceProvider
     /// </summary>
     /// <exception cref="InvalidOperationException">Thrown if this constructor is called even if there is already an instance of this class.</exception>
     public MsiDeviceProvider()
+    {
+        lock (_lock)
         {
             if (_instance != null) throw new InvalidOperationException($"There can be only one instance of type {nameof(MsiDeviceProvider)}");
             _instance = this;
         }
+    }
 
     #endregion
 
@@ -98,14 +111,17 @@ public class MsiDeviceProvider : AbstractRGBDeviceProvider
     private void ThrowMsiError(int errorCode, bool isCritical = false) => Throw(new MysticLightException(errorCode, _MsiSDK.GetErrorMessage(errorCode)), isCritical);
 
     /// <inheritdoc />
-    public override void Dispose()
+    protected override void Dispose(bool disposing)
     {
-        base.Dispose();
+        lock (_lock)
+        {
+            base.Dispose(disposing);
 
             try { _MsiSDK.UnloadMsiSDK(); }
             catch { /* at least we tried */ }
 
-        GC.SuppressFinalize(this);
+            _instance = null;
+        }
     }
 
     #endregion

RGB.NET.Devices.Novation/NovationDeviceProvider.cs

@@ -17,11 +17,21 @@ public sealed class NovationDeviceProvider : AbstractRGBDeviceProvider
 {
     #region Properties & Fields
 
+    // ReSharper disable once InconsistentNaming
+    private static readonly object _lock = new();
+
     private static NovationDeviceProvider? _instance;
     /// <summary>
     /// Gets the singleton <see cref="NovationDeviceProvider"/> instance.
     /// </summary>
-    public static NovationDeviceProvider Instance => _instance ?? new NovationDeviceProvider();
+    public static NovationDeviceProvider Instance
+    {
+        get
+        {
+            lock (_lock)
+                return _instance ?? new NovationDeviceProvider();
+        }
+    }
 
     #endregion
 
@@ -32,10 +42,13 @@ public sealed class NovationDeviceProvider : AbstractRGBDeviceProvider
     /// </summary>
     /// <exception cref="InvalidOperationException">Thrown if this constructor is called even if there is already an instance of this class.</exception>
     private NovationDeviceProvider()
+    {
+        lock (_lock)
         {
             if (_instance != null) throw new InvalidOperationException($"There can be only one instance of type {nameof(NovationDeviceProvider)}");
             _instance = this;
         }
+    }
 
     #endregion
 
@@ -67,5 +80,16 @@ public sealed class NovationDeviceProvider : AbstractRGBDeviceProvider
         }
     }
 
+    /// <inheritdoc />
+    protected override void Dispose(bool disposing)
+    {
+        lock (_lock)
+        {
+            base.Dispose(disposing);
+
+            _instance = null;
+        }
+    }
+
     #endregion
 }

RGB.NET.Devices.OpenRGB/OpenRGBDeviceProvider.cs

@@ -14,6 +14,9 @@ public sealed class OpenRGBDeviceProvider : AbstractRGBDeviceProvider
 {
     #region Properties & Fields
 
+    // ReSharper disable once InconsistentNaming
+    private static readonly object _lock = new();
+
     private readonly List<OpenRgbClient> _clients = new();
 
     private static OpenRGBDeviceProvider? _instance;
@@ -21,7 +24,14 @@ public sealed class OpenRGBDeviceProvider : AbstractRGBDeviceProvider
     /// <summary>
     /// Gets the singleton <see cref="OpenRGBDeviceProvider"/> instance.
     /// </summary>
-    public static OpenRGBDeviceProvider Instance => _instance ?? new OpenRGBDeviceProvider();
+    public static OpenRGBDeviceProvider Instance
+    {
+        get
+        {
+            lock (_lock)
+                return _instance ?? new OpenRGBDeviceProvider();
+        }
+    }
 
     /// <summary>
     /// Gets a list of all defined device-definitions.
@@ -47,10 +57,13 @@ public sealed class OpenRGBDeviceProvider : AbstractRGBDeviceProvider
     /// </summary>
     /// <exception cref="InvalidOperationException">Thrown if this constructor is called even if there is already an instance of this class.</exception>
     public OpenRGBDeviceProvider()
+    {
+        lock (_lock)
         {
             if (_instance != null) throw new InvalidOperationException($"There can be only one instance of type {nameof(OpenRGBDeviceProvider)}");
             _instance = this;
         }
+    }
 
     #endregion
 
@@ -149,9 +162,11 @@ public sealed class OpenRGBDeviceProvider : AbstractRGBDeviceProvider
     }
 
     /// <inheritdoc />
-    public override void Dispose()
+    protected override void Dispose(bool disposing)
     {
-        base.Dispose();
+        lock (_lock)
+        {
+            base.Dispose(disposing);
 
             foreach (OpenRgbClient client in _clients)
             {
@@ -161,6 +176,9 @@ public sealed class OpenRGBDeviceProvider : AbstractRGBDeviceProvider
 
             _clients.Clear();
             DeviceDefinitions.Clear();
+
+            _instance = null;
+        }
     }
 
     #endregion

RGB.NET.Devices.PicoPi/PicoPiDeviceProvider.cs

@@ -25,11 +25,21 @@ public sealed class PicoPiDeviceProvider : AbstractRGBDeviceProvider
 
     #region Properties & Fields
 
+    // ReSharper disable once InconsistentNaming
+    private static readonly object _lock = new();
+
     private static PicoPiDeviceProvider? _instance;
     /// <summary>
     /// Gets the singleton <see cref="PicoPiDeviceProvider"/> instance.
     /// </summary>
-    public static PicoPiDeviceProvider Instance => _instance ?? new PicoPiDeviceProvider();
+    public static PicoPiDeviceProvider Instance
+    {
+        get
+        {
+            lock (_lock)
+                return _instance ?? new PicoPiDeviceProvider();
+        }
+    }
 
     /// <summary>
     /// Gets the HID-definitions for PicoPi-devices.
@@ -56,10 +66,13 @@ public sealed class PicoPiDeviceProvider : AbstractRGBDeviceProvider
     /// </summary>
     /// <exception cref="InvalidOperationException">Thrown if this constructor is called even if there is already an instance of this class.</exception>
     public PicoPiDeviceProvider()
+    {
+        lock (_lock)
         {
             if (_instance != null) throw new InvalidOperationException($"There can be only one instance of type {nameof(PicoPiDeviceProvider)}");
             _instance = this;
         }
+    }
 
     #endregion
 
@@ -126,5 +139,16 @@ public sealed class PicoPiDeviceProvider : AbstractRGBDeviceProvider
         _sdks.Clear();
     }
 
+    /// <inheritdoc />
+    protected override void Dispose(bool disposing)
+    {
+        lock (_lock)
+        {
+            base.Dispose(disposing);
+
+            _instance = null;
+        }
+    }
+
     #endregion
 }

RGB.NET.Devices.Razer/RazerDeviceProvider.cs

@@ -19,11 +19,21 @@ public sealed class RazerDeviceProvider : AbstractRGBDeviceProvider
 {
     #region Properties & Fields
 
+    // ReSharper disable once InconsistentNaming
+    private static readonly object _lock = new();
+
     private static RazerDeviceProvider? _instance;
     /// <summary>
     /// Gets the singleton <see cref="RazerDeviceProvider"/> instance.
     /// </summary>
-    public static RazerDeviceProvider Instance => _instance ?? new RazerDeviceProvider();
+    public static RazerDeviceProvider Instance
+    {
+        get
+        {
+            lock (_lock)
+                return _instance ?? new RazerDeviceProvider();
+        }
+    }
 
     /// <summary>
     /// Gets a modifiable list of paths used to find the native SDK-dlls for x86 applications.
@@ -267,10 +277,13 @@ public sealed class RazerDeviceProvider : AbstractRGBDeviceProvider
     /// </summary>
     /// <exception cref="InvalidOperationException">Thrown if this constructor is called even if there is already an instance of this class.</exception>
     public RazerDeviceProvider()
+    {
+        lock (_lock)
         {
             if (_instance != null) throw new InvalidOperationException($"There can be only one instance of type {nameof(RazerDeviceProvider)}");
             _instance = this;
         }
+    }
 
     #endregion
 
@@ -343,15 +356,20 @@ public sealed class RazerDeviceProvider : AbstractRGBDeviceProvider
     }
 
     /// <inheritdoc />
-    public override void Dispose()
+    protected override void Dispose(bool disposing)
     {
-        base.Dispose();
+        lock (_lock)
+        {
+            base.Dispose(disposing);
 
             TryUnInit();
 
             // DarthAffe 03.03.2020: Fails with an access-violation - verify if an unload is already triggered by uninit
             //try { _RazerSDK.UnloadRazerSDK(); }
             //catch { /* at least we tried */ }
+
+            _instance = null;
+        }
     }
 
     #endregion

RGB.NET.Devices.SteelSeries/SteelSeriesDeviceProvider.cs

@@ -20,11 +20,21 @@ public sealed class SteelSeriesDeviceProvider : AbstractRGBDeviceProvider
 
     #region Properties & Fields
 
+    // ReSharper disable once InconsistentNaming
+    private static readonly object _lock = new();
+
     private static SteelSeriesDeviceProvider? _instance;
     /// <summary>
     /// Gets the singleton <see cref="SteelSeriesDeviceProvider"/> instance.
     /// </summary>
-    public static SteelSeriesDeviceProvider Instance => _instance ?? new SteelSeriesDeviceProvider();
+    public static SteelSeriesDeviceProvider Instance
+    {
+        get
+        {
+            lock (_lock)
+                return _instance ?? new SteelSeriesDeviceProvider();
+        }
+    }
 
     private const int VENDOR_ID = 0x1038;
 
@@ -92,10 +102,13 @@ public sealed class SteelSeriesDeviceProvider : AbstractRGBDeviceProvider
     /// </summary>
     /// <exception cref="InvalidOperationException">Thrown if this constructor is called even if there is already an instance of this class.</exception>
     public SteelSeriesDeviceProvider()
+    {
+        lock (_lock)
         {
             if (_instance != null) throw new InvalidOperationException($"There can be only one instance of type {nameof(SteelSeriesDeviceProvider)}");
             _instance = this;
         }
+    }
 
     #endregion
 
@@ -133,12 +146,17 @@ public sealed class SteelSeriesDeviceProvider : AbstractRGBDeviceProvider
     protected override IDeviceUpdateTrigger CreateUpdateTrigger(int id, double updateRateHardLimit) => new DeviceUpdateTrigger(updateRateHardLimit) { HeartbeatTimer = HEARTBEAT_TIMER };
 
     /// <inheritdoc />
-    public override void Dispose()
+    protected override void Dispose(bool disposing)
     {
-        base.Dispose();
+        lock (_lock)
+        {
+            base.Dispose(disposing);
 
             try { SteelSeriesSDK.Dispose(); }
             catch { /* shit happens */ }
+
+            _instance = null;
+        }
     }
 
     #endregion

RGB.NET.Devices.WS281X/WS281XDeviceProvider.cs

@@ -16,11 +16,21 @@ public sealed class WS281XDeviceProvider : AbstractRGBDeviceProvider
 {
     #region Properties & Fields
 
+    // ReSharper disable once InconsistentNaming
+    private static readonly object _lock = new();
+
     private static WS281XDeviceProvider? _instance;
     /// <summary>
     /// Gets the singleton <see cref="WS281XDeviceProvider"/> instance.
     /// </summary>
-    public static WS281XDeviceProvider Instance => _instance ?? new WS281XDeviceProvider();
+    public static WS281XDeviceProvider Instance
+    {
+        get
+        {
+            lock (_lock)
+                return _instance ?? new WS281XDeviceProvider();
+        }
+    }
 
     /// <summary>
     /// Gets a list of all defined device-definitions.
@@ -38,10 +48,13 @@ public sealed class WS281XDeviceProvider : AbstractRGBDeviceProvider
     /// </summary>
     /// <exception cref="InvalidOperationException">Thrown if this constructor is called even if there is already an instance of this class.</exception>
     public WS281XDeviceProvider()
+    {
+        lock (_lock)
         {
             if (_instance != null) throw new InvalidOperationException($"There can be only one instance of type {nameof(WS281XDeviceProvider)}");
             _instance = this;
         }
+    }
 
     #endregion
 
@@ -70,11 +83,16 @@ public sealed class WS281XDeviceProvider : AbstractRGBDeviceProvider
     }
 
     /// <inheritdoc />
-    public override void Dispose()
+    protected override void Dispose(bool disposing)
     {
-        base.Dispose();
+        lock (_lock)
+        {
+            base.Dispose(disposing);
 
             DeviceDefinitions.Clear();
+
+            _instance = null;
+        }
     }
 
     #endregion

RGB.NET.Devices.Wooting/WootingDeviceProvider.cs

@@ -16,11 +16,21 @@ public sealed class WootingDeviceProvider : AbstractRGBDeviceProvider
 {
     #region Properties & Fields
 
+    // ReSharper disable once InconsistentNaming
+    private static readonly object _lock = new();
+
     private static WootingDeviceProvider? _instance;
     /// <summary>
     /// Gets the singleton <see cref="WootingDeviceProvider"/> instance.
     /// </summary>
-    public static WootingDeviceProvider Instance => _instance ?? new WootingDeviceProvider();
+    public static WootingDeviceProvider Instance
+    {
+        get
+        {
+            lock (_lock)
+                return _instance ?? new WootingDeviceProvider();
+        }
+    }
 
     /// <summary>
     /// Gets a modifiable list of paths used to find the native SDK-dlls for x86 windows applications.
@@ -56,10 +66,13 @@ public sealed class WootingDeviceProvider : AbstractRGBDeviceProvider
     /// </summary>
     /// <exception cref="InvalidOperationException">Thrown if this constructor is called even if there is already an instance of this class.</exception>
     public WootingDeviceProvider()
+    {
+        lock (_lock)
         {
             if (_instance != null) throw new InvalidOperationException($"There can be only one instance of type {nameof(WootingDeviceProvider)}");
             _instance = this;
         }
+    }
 
     #endregion
 
@@ -94,15 +107,20 @@ public sealed class WootingDeviceProvider : AbstractRGBDeviceProvider
     }
 
     /// <inheritdoc />
-    public override void Dispose()
+    protected override void Dispose(bool disposing)
     {
-        base.Dispose();
+        lock (_lock)
+        {
+            base.Dispose(disposing);
 
             lock (_WootingSDK.SdkLock)
             {
                 try { _WootingSDK.UnloadWootingSDK(); }
                 catch { /* at least we tried */ }
             }
+
+            _instance = null;
+        }
     }
 
     #endregion