Browse Source

Merge pull request #3343 from AvaloniaUI/fixes/osx-swallowed-nre-when-window-closes

[OSX] null check to prevent NRE when window closes.
release/0.9.0-rc.2
Nikita Tsukanov 6 years ago
committed by Dan Walmsley
parent
commit
5749637c32
  1. 5
      src/Avalonia.Native/WindowImplBase.cs

5
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;

Loading…
Cancel
Save