From df3fd0472e44c2e514530213eeece2c4cd66ddab Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 5 Mar 2020 11:21:04 +0100
Subject: [PATCH] Detach grid hack on logical tree detachment.

Doing it on visual tree detachment caused the menu to bug out when showing a submenu more than once.
---
 src/Avalonia.Controls/MenuItem.cs | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/Avalonia.Controls/MenuItem.cs b/src/Avalonia.Controls/MenuItem.cs
index f9c3955114..3164e56222 100644
--- a/src/Avalonia.Controls/MenuItem.cs
+++ b/src/Avalonia.Controls/MenuItem.cs
@@ -325,6 +325,9 @@ namespace Avalonia.Controls
             {
                 Command.CanExecuteChanged -= CanExecuteChanged;
             }
+
+            _gridHack?.Dispose();
+            _gridHack = null;
         }
 
         protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
@@ -350,13 +353,6 @@ namespace Avalonia.Controls
             }
         }
 
-        protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
-        {
-            base.OnDetachedFromVisualTree(e);
-            _gridHack.Dispose();
-            _gridHack = null;
-        }
-
         /// <summary>
         /// Called when the <see cref="MenuItem"/> is clicked.
         /// </summary>