Merge branch 'master' into master

5 years ago · f82f125c3d
1 changed files with 1 additions and 1 deletions
--- a/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs
+++ b/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();