Fix crash: consentDialogUI shown before CoreWindow ready

Author: FelixZacher

Files/App.xaml.cs

@@ -19,18 +19,9 @@
 using System.IO;
 using System.Linq;
 using System.Collections.ObjectModel;
-using System.Threading.Tasks;
-using Windows.Devices.Enumeration;
-using Windows.Devices.Portable;
-using Windows.ApplicationModel.Core;
 using Windows.UI.Core;
 using Windows.UI.Xaml.Controls.Primitives;
-using Files.Enums;
-using Windows.UI.Xaml.Media.Imaging;
-using Windows.Management.Deployment;
-using Windows.Storage.Streams;
 using Windows.System;
-using Microsoft.UI.Xaml.Controls;
 using Files.View_Models;
 
 namespace Files
@@ -60,7 +51,7 @@ public static ProHome OccupiedInstance
         public static Dialogs.AddItemDialog addItemDialog { get; set; }
         public static ObservableCollection<SidebarItem> sideBarItems = new ObservableCollection<SidebarItem>();
         public static ObservableCollection<WSLDistroItem> linuxDistroItems = new ObservableCollection<WSLDistroItem>();
-        public static SettingsViewModel AppSettings = new SettingsViewModel();
+        public static SettingsViewModel AppSettings { get; set; }
 
         public App()
         {
@@ -76,6 +67,8 @@ public App()
             Clipboard_ContentChanged(null, null);
             AppCenter.Start("682666d1-51d3-4e4a-93d0-d028d43baaa0", typeof(Analytics), typeof(Crashes));
 
+            AppSettings = new SettingsViewModel();
+
             SetPropertiesFromLocalSettings();
 
             PopulatePinnedSidebarItems();

Files/View Models/SettingsViewModel.cs

@@ -99,31 +99,34 @@ private async void DetectCustomLocations()
 
         private void DetectApplicationTheme()
         {
-            if (localSettings.Values["theme"].ToString() == "Light")
-            {
-                ThemeValue = ThemeStyle.Light;
-                App.Current.RequestedTheme = ApplicationTheme.Light;
-            }
-            else if (localSettings.Values["theme"].ToString() == "Dark")
-            {
-                ThemeValue = ThemeStyle.Dark;
-                App.Current.RequestedTheme = ApplicationTheme.Dark;
-            }
-            else
-            {
-                var uiSettings = new UISettings();
-                var color = uiSettings.GetColorValue(UIColorType.Background);
-                if (color == Colors.White)
-                {
-                    ThemeValue = ThemeStyle.System;
-                    App.Current.RequestedTheme = ApplicationTheme.Light;
-                }
-                else
-                {
-                    ThemeValue = ThemeStyle.System;
-                    App.Current.RequestedTheme = ApplicationTheme.Dark;
-                }
-            }
+	        if (localSettings.Values["theme"] != null)
+	        {
+		        if (localSettings.Values["theme"].ToString() == "Light")
+		        {
+			        ThemeValue = ThemeStyle.Light;
+			        App.Current.RequestedTheme = ApplicationTheme.Light;
+			        return;
+		        }
+		        else if (localSettings.Values["theme"].ToString() == "Dark")
+		        {
+			        ThemeValue = ThemeStyle.Dark;
+			        App.Current.RequestedTheme = ApplicationTheme.Dark;
+			        return;
+		        }
+	        }
+
+	        var uiSettings = new UISettings();
+	        var color = uiSettings.GetColorValue(UIColorType.Background);
+		    if (color == Colors.White)
+		    {
+			    ThemeValue = ThemeStyle.System;
+			    App.Current.RequestedTheme = ApplicationTheme.Light;
+		    }
+		    else
+		    {
+			    ThemeValue = ThemeStyle.System;
+			    App.Current.RequestedTheme = ApplicationTheme.Dark;
+		    }
         }
 
         private FormFactorMode _FormFactor = FormFactorMode.Regular;