[PT Settings] Crash on restart with OOBE window opened fix (#10005)

microsoft · Mar 3, 2021 · de7f8c4 · de7f8c4
1 parent 571e7f2
commit de7f8c4
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/settings-ui/PowerToys.Settings/MainWindow.xaml.cs b/src/settings-ui/PowerToys.Settings/MainWindow.xaml.cs
@@ -73,6 +73,7 @@ private void WindowsXamlHost_ChildChanged(object sender, EventArgs e)
                 ShellPage.SetRestartAdminSndMessageCallback(msg =>
                 {
                     Program.GetTwoWayIPCManager().Send(msg);
+                    isOpen = false;
                     System.Windows.Application.Current.Shutdown(); // close application
                 });
 
@@ -117,7 +118,13 @@ private void WindowsXamlHost_ChildChanged(object sender, EventArgs e)
             // XAML Islands: If the window is open, explicitly force it to be shown to solve the blank dialog issue https://github.com/microsoft/PowerToys/issues/3384
             if (isOpen)
             {
-                Show();
+                try
+                {
+                    Show();
+                }
+                catch (InvalidOperationException)
+                {
+                }
             }
         }