Fix Closed not being called for macOS popups (#17753)

1 year ago · 36efc98c57
1 changed files with 6 additions and 6 deletions
--- 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];
    }
 }