prevent crash on multithreaded access to MotherboardInfo.Manufacturer

CasperH2O · Dec 7, 2023 · c40e205 · c40e205
1 parent 4e7f4e8
commit c40e205
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/HandheldCompanion/Managers/ControllerManager.cs b/HandheldCompanion/Managers/ControllerManager.cs
@@ -788,8 +788,8 @@ private static async void XUsbDeviceArrived(PnPDetails details, DeviceEventArgs
                 Color _systemAccent = MainWindow.uiSettings.GetColorValue(UIColorType.Accent);
                 targetController.SetLightColor(_systemAccent.R, _systemAccent.G, _systemAccent.B);
 
-                var ManufacturerName = MotherboardInfo.Manufacturer.ToUpper();
-                switch(ManufacturerName)
+                string ManufacturerName = MotherboardInfo.Manufacturer.ToUpper();
+                switch (ManufacturerName)
                 {
                     case "AOKZOE":
                     case "ONE-NETBOOK TECHNOLOGY CO., LTD.":

diff --git a/HandheldCompanion/Misc/MotherboardInfo.cs b/HandheldCompanion/Misc/MotherboardInfo.cs
@@ -90,18 +90,25 @@ public static string InstallDate
         }
     }
 
+    private static string _Manufacturer;
     public static string Manufacturer
     {
         get
         {
+            if (!string.IsNullOrEmpty(_Manufacturer))
+                return _Manufacturer;
+
             foreach (ManagementObject queryObj in baseboardCollection)
             {
                 var query = queryObj["Manufacturer"];
                 if (query is not null)
-                    return query.ToString();
+                {
+                    _Manufacturer = query.ToString();
+                    break;
+                }
             }
 
-            return string.Empty;
+            return _Manufacturer;
         }
     }
 
@@ -132,8 +139,11 @@ public static int NumberOfCores
             {
                 var query = queryObj["NumberOfCores"];
                 if (query is not null)
+                {
                     if (int.TryParse(query.ToString(), out var value))
                         _NumberOfCores = value;
+                    break;
+                }
             }
 
             return _NumberOfCores;
@@ -245,8 +255,11 @@ public static uint ProcessorMaxClockSpeed
             {
                 var query = queryObj["MaxClockSpeed"];
                 if (query is not null)
+                {
                     if (uint.TryParse(query.ToString(), out var value))
                         _ProcessorMaxClockSpeed = value;
+                    break;
+                }
             }
 
             return _ProcessorMaxClockSpeed;