Load settings before window initialization

Now the UI won't show the light theme at startup when the dark was selected.

Author: timfrankentwf

RaceControl/RaceControl/App.xaml.cs

@@ -38,6 +38,9 @@ namespace RaceControl
 {
     public partial class App
     {
+        private static readonly ResourceDictionary LightTheme = new() { Source = new Uri(@"/Themes/LightTheme.xaml", UriKind.Relative) };
+        private static readonly ResourceDictionary DarkTheme = new() { Source = new Uri(@"/Themes/DarkTheme.xaml", UriKind.Relative) };
+
         private readonly SplashScreen _splashScreen = new("splashscreen.png");
 
         private static int _flyleafUniqueId;
@@ -100,6 +103,12 @@ protected override void RegisterTypes(IContainerRegistry registry)
 
         protected override Window CreateShell()
         {
+            var settings = Container.Resolve<ISettings>();
+            settings.Load();
+
+            App.Current.Resources.MergedDictionaries.Clear();
+            App.Current.Resources.MergedDictionaries.Add(settings.UseDarkTheme ? DarkTheme : LightTheme);
+
             _splashScreen.Close(TimeSpan.Zero);
 
             return Container.Resolve<MainWindow>();

RaceControl/RaceControl/ViewModels/MainWindowViewModel.cs

@@ -291,7 +291,6 @@ public Track SelectedAudioTrack
         private void LoadedExecute(RoutedEventArgs args)
         {
             IsBusy = true;
-            Settings.Load();
             VideoDialogLayout.Load();
             UpdateThemeCommand.TryExecute();
             SetVlcExeLocation();