device config fixes for first-time users

Aurora-RGB · Jan 22, 2024 · 5901b87 · 5901b87
1 parent 16eb8a2
commit 5901b87
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/Project-Aurora/Project-Aurora/App.xaml.cs b/Project-Aurora/Project-Aurora/App.xaml.cs
@@ -90,8 +90,8 @@ protected override async void OnStartup(StartupEventArgs e)
 
         //Load config
         Global.logger.Information("Loading Configuration");
-        Global.Configuration = ConfigManager.Load();
         Global.DeviceConfiguration = ConfigManager.LoadDeviceConfig();
+        Global.Configuration = ConfigManager.Load();
 
         Global.effengine = new Effects(DevicesModule.DeviceManager);
 

diff --git a/Project-Aurora/Project-Aurora/Settings/ConfigManager.cs b/Project-Aurora/Project-Aurora/Settings/ConfigManager.cs
@@ -49,7 +49,7 @@ private static Configuration TryLoad()
             }
 
             App.ForceShutdownApp(-1);
-            throw new Exception();
+            throw new ApplicationException("irrelevant message");
         }
     }
 
@@ -90,8 +90,18 @@ public static DeviceConfig LoadDeviceConfig()
     private static DeviceConfig TryLoadDevice()
     {
         if (!File.Exists(DeviceConfig.ConfigFile))
-            return MigrateDeviceConfig();
-
+        {
+            if (File.Exists(Configuration.ConfigFile))
+                // v194 Migration
+                return MigrateDeviceConfig();
+
+            // first time start
+            var deviceConfig = new DeviceConfig();
+            Save(deviceConfig, DeviceConfig.ConfigFile);
+            return deviceConfig;
+
+        }
+
         var content = File.ReadAllText(DeviceConfig.ConfigFile, Encoding.UTF8);
         return JsonConvert.DeserializeObject<DeviceConfig>(content,
             new JsonSerializerSettings
@@ -139,7 +149,7 @@ private static DeviceConfig MigrateDeviceConfig()
                 ObjectCreationHandling = ObjectCreationHandling.Replace,
                 SerializationBinder = new AuroraSerializationBinder(),
             }) ?? new DeviceConfig();
-        File.Copy(Configuration.ConfigFile, Configuration.ConfigFile + ".v194");
+        File.Copy(Configuration.ConfigFile, Configuration.ConfigFile + ".v194", true);
         return config;
     }
 }