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(); - if(window) + auto parent = _parent.tryGetWithCast(); + if (parent) { - - if(window != nullptr) + auto window = parent.dynamicCast(); + if (window) { window->SetParent(nullptr); } - window->BaseEvents->Closed(); - [window->View onClosed]; + parent->BaseEvents->Closed(); + [parent->View onClosed]; } }