Merge pull request #4924 from donandren/issues/4923

macos fix crash on popup close #4293
6 years ago · 7d874f7818
1 changed files with 6 additions and 0 deletions
--- a/native/Avalonia.Native/src/OSX/window.mm
+++ b/native/Avalonia.Native/src/OSX/window.mm
@ -1338,6 +1338,12 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
    }
    
    _parent->BaseEvents->RunRenderPriorityJobs();
+    
+    if (_parent == nullptr)
+    {
+        return;
+    }
+        
    _parent->BaseEvents->Paint();
 }