Merge pull request AvaloniaUI#8249 from AvaloniaUI/fixes/osx-crash-on…

…-main-window-close prevent segfault when closing app with child windows open.
donandren · Jun 2, 2022 · d19ee54 · d19ee54
1 parent 4f036d7
commit d19ee54
Showing 1 changed file with 17 additions and 17 deletions.
diff --git 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();
+        }
     }
 }