Browse Source

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

[OSX] null check to prevent NRE when window closes.
pull/3350/head
Nikita Tsukanov 6 years ago
committed by GitHub
parent
commit
e9bae4ea21
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  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) public void SetCursor(IPlatformHandle cursor)
{ {
if (_native == null)
{
return;
}
var newCursor = cursor as AvaloniaNativeCursor; var newCursor = cursor as AvaloniaNativeCursor;
newCursor = newCursor ?? (_cursorFactory.GetCursor(StandardCursorType.Arrow) as AvaloniaNativeCursor); newCursor = newCursor ?? (_cursorFactory.GetCursor(StandardCursorType.Arrow) as AvaloniaNativeCursor);
_native.Cursor = newCursor.Cursor; _native.Cursor = newCursor.Cursor;

Loading…
Cancel
Save