Fixed an issue causing a crash when DriverStore couldn't be deserialized

Valkirie · Nov 30, 2024 · 528c697 · 528c697
1 parent 226a1ae
commit 528c697
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/HandheldCompanion/Helpers/DriverStore.cs b/HandheldCompanion/Helpers/DriverStore.cs
@@ -1,7 +1,10 @@
-using HandheldCompanion.Views;
+using HandheldCompanion.Shared;
+using HandheldCompanion.Views;
 using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
 using System.IO;
+using static PInvoke.Kernel32;
 
 namespace HandheldCompanion.Helpers
 {
@@ -37,8 +40,17 @@ private static Dictionary<string, string> DeserializeDriverStore()
             if (!File.Exists(DriversPath))
                 return [];
 
-            string json = File.ReadAllText(DriversPath);
-            return JsonConvert.DeserializeObject<Dictionary<string, string>>(json);
+            try
+            {
+                string json = File.ReadAllText(DriversPath);
+                return JsonConvert.DeserializeObject<Dictionary<string, string>>(json);
+            }
+            catch (Exception ex)
+            {
+                LogManager.LogError("Could not retrieve drivers store {0}", ex.Message);
+            }
+
+            return [];
         }
 
         public static string GetDriverFromDriverStore(string path)