From d19ee5468f250541ba692ecf6f176330b691b3ea Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Thu, 2 Jun 2022 18:55:09 +0100
Subject: [PATCH] Merge pull request #8249 from
 AvaloniaUI/fixes/osx-crash-on-main-window-close

prevent segfault when closing app with child windows open.
---
 native/Avalonia.Native/src/OSX/WindowImpl.mm | 34 ++++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/native/Avalonia.Native/src/OSX/WindowImpl.mm b/native/Avalonia.Native/src/OSX/WindowImpl.mm
index 3da72fceef1..97920c975bb 100644
--- a/native/Avalonia.Native/src/OSX/WindowImpl.mm
+++ b/native/Avalonia.Native/src/OSX/WindowImpl.mm
@@ -90,11 +90,8 @@
         if(_parent != nullptr)
         {
             _parent->_children.remove(this);
-            auto parent = _parent;
             
-            dispatch_async(dispatch_get_main_queue(), ^{
-                parent->BringToFront();
-            });
+            _parent->BringToFront();
         }
 
         auto cparent = dynamic_cast<WindowImpl *>(parent);
@@ -121,20 +118,23 @@
 
 void WindowImpl::BringToFront()
 {
-    if(IsDialog())
+    if(Window != nullptr)
     {
-        Activate();
-    }
-    else
-    {
-        [Window orderFront:nullptr];
-    }
-    
-    [Window invalidateShadow];
-    
-    for(auto iterator = _children.begin(); iterator != _children.end(); iterator++)
-    {
-        (*iterator)->BringToFront();
+        if(IsDialog())
+        {
+            Activate();
+        }
+        else
+        {
+            [Window orderFront:nullptr];
+        }
+        
+        [Window invalidateShadow];
+        
+        for(auto iterator = _children.begin(); iterator != _children.end(); iterator++)
+        {
+            (*iterator)->BringToFront();
+        }
     }
 }