Improved handling of critical sections to solve deadlocks.

app/Peripherals/PeripheralsProvider.cs

@@ -1,21 +1,28 @@
 using GHelper.Peripherals.Mouse;
 using GHelper.Peripherals.Mouse.Models;
-using System.Runtime.CompilerServices;
 
 namespace GHelper.Peripherals
 {
     public class PeripheralsProvider
     {
-        public static object _LOCK = new object();
+        private static readonly object _LOCK = new object();
 
         public static List<AsusMouse> ConnectedMice = new List<AsusMouse>();
 
         public static event EventHandler? DeviceChanged;
 
         public static bool IsMouseConnected()
+        {
+            lock (_LOCK)
             {
                 return ConnectedMice.Count > 0;
             }
+        }
+
+        public static bool IsDeviceConnected(IPeripheral peripheral)
+        {
+            return AllPeripherals().Contains(peripheral);
+        }
 
         //Expand if keyboards or other device get supported later.
         public static bool IsAnyPeripheralConnect()
@@ -26,18 +33,18 @@ namespace GHelper.Peripherals
         public static List<IPeripheral> AllPeripherals()
         {
             List<IPeripheral> l = new List<IPeripheral>();
+            lock (_LOCK)
+            {
                 l.AddRange(ConnectedMice);
-
+            }
             return l;
         }
 
         public static void RefreshBatteryForAllDevices()
         {
-            if (!IsAnyPeripheralConnect()) return;
+            List<IPeripheral> l = AllPeripherals();
 
-            lock (_LOCK)
+            foreach (IPeripheral m in l)
-            {
-                foreach (IPeripheral m in AllPeripherals())
             {
                 if (!m.IsDeviceReady)
                 {
@@ -51,29 +58,27 @@ namespace GHelper.Peripherals
             }
         }
 
-        }
-
         public static void Disconnect(AsusMouse am)
         {
             lock (_LOCK)
             {
                 ConnectedMice.Remove(am);
+            }
             if (DeviceChanged is not null)
             {
                 DeviceChanged(am, EventArgs.Empty);
             }
         }
-        }
 
         public static void Connect(AsusMouse am)
         {
-            lock (_LOCK)
+
-            {
+            if (IsDeviceConnected(am))
-                if (ConnectedMice.Contains(am))
             {
                 //Mouse already connected;
                 return;
             }
+
             try
             {
                 am.Connect();
@@ -84,8 +89,6 @@ namespace GHelper.Peripherals
                 return;
             }
 
-                am.Disconnect += Mouse_Disconnect;
-
             //The Mouse might needs a few ms to register all its subdevices or the sync will fail.
             //Retry 3 times. Do not call this on main thread! It would block the UI
 
@@ -98,15 +101,20 @@ namespace GHelper.Peripherals
                 ++tries;
             }
 
+            lock (_LOCK)
+            {
                 ConnectedMice.Add(am);
+            }
             Logger.WriteLine(am.GetDisplayName() + " added to the list: " + ConnectedMice.Count + " device are conneted.");
+
+
+            am.Disconnect += Mouse_Disconnect;
             if (DeviceChanged is not null)
             {
                 DeviceChanged(am, EventArgs.Empty);
             }
             UpdateSettingsView();
         }
-        }
 
         private static void Mouse_Disconnect(object? sender, EventArgs e)
         {
@@ -114,15 +122,18 @@ namespace GHelper.Peripherals
             {
                 return;
             }
+
+            AsusMouse am = (AsusMouse)sender;
             lock (_LOCK)
             {
-                AsusMouse am = (AsusMouse)sender;
                 ConnectedMice.Remove(am);
+            }
+
             Logger.WriteLine(am.GetDisplayName() + " reported disconnect. " + ConnectedMice.Count + " device are conneted.");
             am.Dispose();
+
             UpdateSettingsView();
         }
-        }
 
 
         private static void UpdateSettingsView()
@@ -141,12 +152,11 @@ namespace GHelper.Peripherals
             DetectMouse(new ChakramXWired());
             DetectMouse(new GladiusIII());
             DetectMouse(new GladiusIIIWired());
-            UpdateSettingsView();
         }
 
         public static void DetectMouse(AsusMouse am)
         {
-            if (am.IsDeviceConnected() && !ConnectedMice.Contains(am))
+            if (am.IsDeviceConnected() && !IsDeviceConnected(am))
             {
                 Logger.WriteLine("Detected a new" + am.GetDisplayName() + " . Connecting...");
                 Connect(am);