From ea3f85e1263cfb75ce2452e205477080d1c9b531 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 6 Jul 2021 09:34:18 +0200
Subject: [PATCH] Don't allow using a closed window as a parent/owner.

---
 src/Avalonia.Controls/Window.cs               | 10 +++++++
 .../WindowTests.cs                            | 30 +++++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/src/Avalonia.Controls/Window.cs b/src/Avalonia.Controls/Window.cs
index 700c3d9bad..2d369dae8c 100644
--- a/src/Avalonia.Controls/Window.cs
+++ b/src/Avalonia.Controls/Window.cs
@@ -635,6 +635,11 @@ namespace Avalonia.Controls
                 throw new InvalidOperationException("Cannot re-show a closed window.");
             }
 
+            if (parent != null && parent.PlatformImpl == null)
+            {
+                throw new InvalidOperationException("Cannot Show a Window with a closed parent.");
+            }
+
             if (IsVisible)
             {
                 return;
@@ -709,6 +714,11 @@ namespace Avalonia.Controls
                 throw new ArgumentNullException(nameof(owner));
             }
 
+            if (owner.PlatformImpl == null)
+            {
+                throw new InvalidOperationException("Cannot Show a Window with a closed owner.");
+            }
+
             if (IsVisible)
             {
                 throw new InvalidOperationException("The window is already being shown.");
diff --git a/tests/Avalonia.Controls.UnitTests/WindowTests.cs b/tests/Avalonia.Controls.UnitTests/WindowTests.cs
index e8311b79ac..2d4559ddba 100644
--- a/tests/Avalonia.Controls.UnitTests/WindowTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/WindowTests.cs
@@ -387,6 +387,36 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
+        [Fact]
+        public void Calling_Show_With_Closed_Parent_Window_Should_Throw()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var parent = new Window();
+                var target = new Window();
+
+                parent.Close();
+
+                var ex = Assert.Throws<InvalidOperationException>(() => target.Show(parent));
+                Assert.Equal("Cannot Show a Window with a closed parent.", ex.Message);
+            }
+        }
+
+        [Fact]
+        public async Task Calling_ShowDialog_With_Closed_Parent_Window_Should_Throw()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var parent = new Window();
+                var target = new Window();
+
+                parent.Close();
+
+                var ex = await Assert.ThrowsAsync<InvalidOperationException>(() => target.ShowDialog(parent));
+                Assert.Equal("Cannot Show a Window with a closed owner.", ex.Message);
+            }
+        }
+
         [Fact]
         public void Window_Should_Be_Centered_When_WindowStartupLocation_Is_CenterScreen()
         {