From c907172b8f07dace7801ddd0848f4c982cb8f794 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Wed, 11 Dec 2019 10:06:12 -0300 Subject: [PATCH] [OSX] null check to prevent NRE when window closes. --- src/Avalonia.Native/WindowImplBase.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Avalonia.Native/WindowImplBase.cs b/src/Avalonia.Native/WindowImplBase.cs index e72fefe3ce..5d701dc8df 100644 --- a/src/Avalonia.Native/WindowImplBase.cs +++ b/src/Avalonia.Native/WindowImplBase.cs @@ -353,6 +353,11 @@ namespace Avalonia.Native public void SetCursor(IPlatformHandle cursor) { + if (_native == null) + { + return; + } + var newCursor = cursor as AvaloniaNativeCursor; newCursor = newCursor ?? (_cursorFactory.GetCursor(StandardCursorType.Arrow) as AvaloniaNativeCursor); _native.Cursor = newCursor.Cursor;