From 3e1940f766125def292772267111c18b26f576f6 Mon Sep 17 00:00:00 2001
From: Julien Lebosquain <julien@lebosquain.net>
Date: Thu, 12 Dec 2024 00:10:05 +0100
Subject: [PATCH] Fix Closed not being called for macOS popups (#17753)

---
 native/Avalonia.Native/src/OSX/AvnWindow.mm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/native/Avalonia.Native/src/OSX/AvnWindow.mm b/native/Avalonia.Native/src/OSX/AvnWindow.mm
index 6f5e33a1c8..6ccb902cd9 100644
--- a/native/Avalonia.Native/src/OSX/AvnWindow.mm
+++ b/native/Avalonia.Native/src/OSX/AvnWindow.mm
@@ -214,17 +214,17 @@
 - (void)windowWillClose:(NSNotification *_Nonnull)notification
 {
     _closed = true;
-    auto window = _parent.tryGetWithCast<WindowImpl>();
-    if(window)
+    auto parent = _parent.tryGetWithCast<WindowBaseImpl>();
+    if (parent)
     {
-        
-        if(window != nullptr)
+        auto window = parent.dynamicCast<WindowImpl>();
+        if (window)
         {
             window->SetParent(nullptr);
         }
         
-        window->BaseEvents->Closed();
-        [window->View onClosed];
+        parent->BaseEvents->Closed();
+        [parent->View onClosed];
     }
 }