From cee1a24e0330d4daedea663e858ee33d761d2227 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Wed, 7 Jul 2021 17:06:59 +0200
Subject: [PATCH] Only try to close non-owned windows on shutdown.

Owned windows will be closed by their owners.
---
 .../ClassicDesktopStyleApplicationLifetime.cs               | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/ApplicationLifetimes/ClassicDesktopStyleApplicationLifetime.cs b/src/Avalonia.Controls/ApplicationLifetimes/ClassicDesktopStyleApplicationLifetime.cs
index 2c43f13c82..2256f4cb54 100644
--- a/src/Avalonia.Controls/ApplicationLifetimes/ClassicDesktopStyleApplicationLifetime.cs
+++ b/src/Avalonia.Controls/ApplicationLifetimes/ClassicDesktopStyleApplicationLifetime.cs
@@ -132,8 +132,12 @@ namespace Avalonia.Controls.ApplicationLifetimes
         
         private void ShutdownRequested(object sender, CancelEventArgs e)
         {
+            // When an OS shutdown request is received, try to close all non-owned windows. Windows can cancel
+            // shutdown by setting e.Cancel = true in the Closing event. Owned windows will be shutdown by their
+            // owners.
             foreach (var w in Windows)
-                w.Close();
+                if (w.Owner is null)
+                    w.Close();
             if (Windows.Count > 0)
                 e.Cancel = true;
         }