Fix issue where creating a modern window before ThemeManager is initi…

…alized can crash the app
Kinnara · Nov 7, 2019 · 8e09156 · 8e09156
1 parent 7d89cdd
commit 8e09156
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/ModernWpf/ThemeManager.cs b/ModernWpf/ThemeManager.cs
@@ -316,7 +316,12 @@ internal static void UpdateWindowActualTheme(Window window)
             var requestedTheme = GetRequestedTheme(window);
             if (requestedTheme == ElementTheme.Default)
             {
-                SetActualTheme(window, Current.ActualApplicationTheme.Value == ModernWpf.ApplicationTheme.Dark ? ElementTheme.Dark : ElementTheme.Light);
+                var actualAppTheme = Current.ActualApplicationTheme;
+                if (actualAppTheme.HasValue)
+                {
+                    SetActualTheme(window, actualAppTheme.Value == ModernWpf.ApplicationTheme.Dark ?
+                        ElementTheme.Dark : ElementTheme.Light);
+                }
             }
             else
             {