From 425c3e8fecf0a419b21fa1dbc781008aa73905ee Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Wed, 10 Mar 2021 22:20:47 +0000 Subject: [PATCH] OSX backend when quiting app (closeAll) should only performClose on non-child windows. --- 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 7fa6614d4d..4d63c486c4 100644 --- a/native/Avalonia.Native/src/OSX/window.mm +++ b/native/Avalonia.Native/src/OSX/window.mm @@ -1877,7 +1877,12 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent for(int i = 0; i < numWindows; i++) { - [[windows objectAtIndex:i] performClose:nil]; + auto window = (AvnWindow*)[windows objectAtIndex:i]; + + if([window parentWindow] == nullptr) // Avalonia will handle the child windows. + { + [window performClose:nil]; + } } }