From 945b371bd7ffa64242c51da887750d4a6690dfb1 Mon Sep 17 00:00:00 2001 From: Jumar Macato <16554748+jmacato@users.noreply.github.com> Date: Wed, 17 Jul 2024 18:08:00 +0800 Subject: [PATCH] Don't crash when a misbehaving app calls Show on a closed/closing window on macOS (#16341) yolo merging coz of integration tests being flaky, with @grokys 's approval --- src/Avalonia.Native/WindowImpl.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Avalonia.Native/WindowImpl.cs b/src/Avalonia.Native/WindowImpl.cs index 8d60f8fbce..a278bda67e 100644 --- a/src/Avalonia.Native/WindowImpl.cs +++ b/src/Avalonia.Native/WindowImpl.cs @@ -6,6 +6,7 @@ using Avalonia.Input.Raw; using Avalonia.Input.TextInput; using Avalonia.Native.Interop; using Avalonia.Platform; +using MicroCom.Runtime; namespace Avalonia.Native { @@ -156,6 +157,9 @@ namespace Avalonia.Native private void InvalidateExtendedMargins() { + if(_native is MicroComProxyBase pb && pb.IsDisposed) + return; + if (WindowState == WindowState.FullScreen) { ExtendedMargins = new Thickness();