From 94ee541998e2965ea11f0ccaaec51654a9f1fcc1 Mon Sep 17 00:00:00 2001 From: AnastassiaP <107254966+AnastassiaP@users.noreply.github.com> Date: Wed, 30 Apr 2025 18:35:08 +0300 Subject: [PATCH] Fix null reference crash when window is closed during drag-and-drop (#18760) --- native/Avalonia.Native/src/OSX/AvnView.mm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/native/Avalonia.Native/src/OSX/AvnView.mm b/native/Avalonia.Native/src/OSX/AvnView.mm index e533bb4040..2799425638 100644 --- a/native/Avalonia.Native/src/OSX/AvnView.mm +++ b/native/Avalonia.Native/src/OSX/AvnView.mm @@ -836,6 +836,8 @@ static void ConvertTilt(NSPoint tilt, float* xTilt, float* yTilt) auto effects = ConvertDragDropEffects(nsop); auto parent = _parent.tryGet(); + if (!parent) + return NSDragOperationNone; int reffects = (int)parent->TopLevelEvents ->DragEvent(type, point, modifiers, effects, CreateClipboard([info draggingPasteboard], nil),