From 5ad8c41f37a593f0d3861e5308fb45201f96fa4f Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sun, 5 Apr 2020 17:19:58 +0200
Subject: [PATCH] Fix NRE in ContextMenu.

---
 src/Avalonia.Controls/ContextMenu.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/ContextMenu.cs b/src/Avalonia.Controls/ContextMenu.cs
index bb9b853c28..1735599988 100644
--- 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)