allow MainWindow close mode and LastWindowClose mode to be cancellable.

4 years ago · ed35eeeb69
1 changed files with 3 additions and 3 deletions
--- a/src/Avalonia.Controls/ApplicationLifetimes/ClassicDesktopStyleApplicationLifetime.cs
+++ b/src/Avalonia.Controls/ApplicationLifetimes/ClassicDesktopStyleApplicationLifetime.cs
@ -76,9 +76,9 @@ namespace Avalonia.Controls.ApplicationLifetimes
                return;

            if (ShutdownMode == ShutdownMode.OnLastWindowClose && _windows.Count == 0)
-                Shutdown();
-            else if (ShutdownMode == ShutdownMode.OnMainWindowClose && window == MainWindow)
-                Shutdown();
+                TryShutdown();
+            else if (ShutdownMode == ShutdownMode.OnMainWindowClose && ReferenceEquals(window, MainWindow))
+                TryShutdown();
        }

        public void Shutdown(int exitCode = 0)