Browse Source
Merge pull request #7373 from AvaloniaUI/fix-nre-menu-close
Fix NRE on window close with opened menu
pull/7374/head
Tako
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
1 additions and
1 deletions
-
src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs
|
|
|
@ -101,7 +101,7 @@ namespace Avalonia.Controls.Platform |
|
|
|
root.Deactivated -= WindowDeactivated; |
|
|
|
} |
|
|
|
|
|
|
|
if (_root is TopLevel tl) |
|
|
|
if (_root is TopLevel tl && tl.PlatformImpl != null) |
|
|
|
tl.PlatformImpl.LostFocus -= TopLevelLostPlatformFocus; |
|
|
|
|
|
|
|
_inputManagerSubscription?.Dispose(); |
|
|
|
|
