Fixed possible crash on system startup.

ThatUsernameAlreadyExist · Feb 15, 2025 · 39a8ba1 · 39a8ba1
1 parent d42b3c7
commit 39a8ba1
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 16 deletions.
diff --git a/src/BLEMouseWatcher/Program.cs b/src/BLEMouseWatcher/Program.cs
@@ -87,21 +87,33 @@ static void Main(string[] args)
                     }
                 }
             }
-        }
-
-
-        static BluetoothLEDevice findMonitoredBluetoothLEDevice()
+        }
+
+        static BluetoothLEDevice findMonitoredBluetoothLEDevice()
         {
-            Task<DeviceInformationCollection> task = DeviceInformation.FindAllAsync(BluetoothLEDevice.GetDeviceSelector()).AsTask();
-            foreach (DeviceInformation device in task.Result)
-            {
-                if (monitoredDevices.Contains(device.Name))
+            try
+            {
+                Task<DeviceInformationCollection> task = DeviceInformation.FindAllAsync(BluetoothLEDevice.GetDeviceSelector()).AsTask();
+                foreach (DeviceInformation device in task.Result)
                 {
-                    Task<BluetoothLEDevice> bleDevice = BluetoothLEDevice.FromIdAsync(device.Id).AsTask();
-                    return bleDevice.Result;
-                }
-            }
-            return null;
-        }
+                    if (monitoredDevices.Contains(device.Name))
+                    {
+                        Task<BluetoothLEDevice> bleDevice = BluetoothLEDevice.FromIdAsync(device.Id).AsTask();
+                        try
+                        {
+                            return bleDevice.Result;
+                        }
+                        catch (Exception)
+                        {
+                        }
+                    }
+                }
+            }
+            catch (Exception)
+            {
+            }
+
+            return null;
+        }
     }
 }
diff --git a/src/BLEMouseWatcher/Properties/AssemblyInfo.cs b/src/BLEMouseWatcher/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.0.0")]
-[assembly: AssemblyFileVersion("3.0.0.0")]
+[assembly: AssemblyVersion("3.0.2.0")]
+[assembly: AssemblyFileVersion("3.0.2.0")]