Fix NRE in ContextMenu.

6 years ago · 5ad8c41f37
1 changed files with 1 additions and 1 deletions
--- a/src/Avalonia.Controls/ContextMenu.cs
+++ b/src/Avalonia.Controls/ContextMenu.cs
@ -75,7 +75,7 @@ namespace Avalonia.Controls
            {
                control.PointerReleased -= ControlPointerReleased;
                oldMenu._attachedControl = null;
-                ((ISetLogicalParent)oldMenu._popup).SetParent(null);
+                ((ISetLogicalParent)oldMenu._popup)?.SetParent(null);
            }

            if (e.NewValue is ContextMenu newMenu)