From 84acf920886c8f8172ac7d30a0e7b0b3ed749a31 Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Mon, 3 Feb 2020 20:17:50 +0300 Subject: [PATCH] Merge pull request #3507 from donandren/issues/3500 fix #3500 crash after close any fullscreen window on mac --- native/Avalonia.Native/src/OSX/window.mm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/native/Avalonia.Native/src/OSX/window.mm b/native/Avalonia.Native/src/OSX/window.mm index 66cedf23e4..75112d5dab 100644 --- a/native/Avalonia.Native/src/OSX/window.mm +++ b/native/Avalonia.Native/src/OSX/window.mm @@ -804,7 +804,12 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent [self removeTrackingArea:_area]; _area = nullptr; } - + + if (_parent == nullptr) + { + return; + } + NSRect rect = NSZeroRect; rect.size = newSize;