Merge pull request AvaloniaUI#10431 from AvaloniaUI/fixes/osx-menu-reparenting-crash

grokys · grokys · commit 136a0ab8dd2d · 2023-02-24T08:33:32.000+01:00
if the window is closed, we cannot become the key window.
diff --git a/native/Avalonia.Native/src/OSX/AvnWindow.mm b/native/Avalonia.Native/src/OSX/AvnWindow.mm
@@ -237,7 +237,7 @@ - (NSRect)windowWillUseStandardFrame:(NSWindow*)window
 
 -(BOOL)canBecomeKeyWindow
 {
-    if(_canBecomeKeyWindow)
+    if(_canBecomeKeyWindow && !_closed)
     {
         // If the window has a child window being shown as a dialog then don't allow it to become the key window.
         auto parent = dynamic_cast<WindowImpl*>(_parent.getRaw());

Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,7 @@ - (NSRect)windowWillUseStandardFrame:(NSWindow*)window`
`237`	`237`
`238`	`238`	`-(BOOL)canBecomeKeyWindow`
`239`	`239`	`{`
`240`		`- if(_canBecomeKeyWindow)`
	`240`	`+ if(_canBecomeKeyWindow && !_closed)`
`241`	`241`	`{`
`242`	`242`	`// If the window has a child window being shown as a dialog then don't allow it to become the key window.`
`243`	`243`	`auto parent = dynamic_cast<WindowImpl*>(_parent.getRaw());`