Fix crash due to uninitialized XamlRoot when activating a dialog on O…

…OBE page
Xcube-Studio · Dec 25, 2024 · 3909fc9 · 3909fc9
1 parent 7c9061e
commit 3909fc9
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/Natsurainko.FluentLauncher/Views/MainWindow.xaml.cs b/Natsurainko.FluentLauncher/Views/MainWindow.xaml.cs
@@ -47,8 +47,6 @@ public MainWindow(
 
     private void MainWindow_Activated(object sender, WindowActivatedEventArgs args)
     {
-        _navigationService.NavigateTo(_settingsService.FinishGuide ? "ShellPage" : "OOBENavigationPage");
-
         this.CenterOnScreen();
 
         if (_settingsService.AppWindowState == WindowState.Maximized)
@@ -109,5 +107,9 @@ void ConfigureWindow()
         this.Activated += MainWindow_Activated;
     }
 
-    private void Frame_Loaded(object sender, RoutedEventArgs e) => XamlRoot = Frame.XamlRoot;
+    private void Frame_Loaded(object sender, RoutedEventArgs e)
+    {
+        XamlRoot = Frame.XamlRoot;
+        _navigationService.NavigateTo(_settingsService.FinishGuide ? "ShellPage" : "OOBENavigationPage");
+    }
 }