Browse Source
Merge pull request #5013 from AvaloniaUI/fixes/osx-crash-when-popup-open-and-app-closes
prevent NRE when popup is open and main window closes.
pull/5017/head
Dan Walmsley
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
3 additions and
2 deletions
-
src/Avalonia.Native/WindowImplBase.cs
|
|
@ -155,10 +155,10 @@ namespace Avalonia.Native |
|
|
} |
|
|
} |
|
|
finally |
|
|
finally |
|
|
{ |
|
|
{ |
|
|
|
|
|
|
|
|
|
|
|
_parent?.Dispose(); |
|
|
n?.Dispose(); |
|
|
n?.Dispose(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
_parent._mouse.Dispose(); |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
void IAvnWindowBaseEvents.Activated() => _parent.Activated?.Invoke(); |
|
|
void IAvnWindowBaseEvents.Activated() => _parent.Activated?.Invoke(); |
|
|
@ -336,6 +336,7 @@ namespace Avalonia.Native |
|
|
_nativeControlHost = null; |
|
|
_nativeControlHost = null; |
|
|
|
|
|
|
|
|
(Screen as ScreenImpl)?.Dispose(); |
|
|
(Screen as ScreenImpl)?.Dispose(); |
|
|
|
|
|
_mouse.Dispose(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|