From ca34bf9aba582e101d65a4ccf68e0e530c5cf73d Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@users.noreply.github.com>
Date: Sun, 26 Aug 2018 19:37:27 +0200
Subject: [PATCH] Don't assume Items are MenuItems.

They may be created via `DataTemplate`s.
---
 src/Avalonia.Controls/MenuItem.cs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/Avalonia.Controls/MenuItem.cs b/src/Avalonia.Controls/MenuItem.cs
index 91f427936c..7b57783c5a 100644
--- a/src/Avalonia.Controls/MenuItem.cs
+++ b/src/Avalonia.Controls/MenuItem.cs
@@ -342,7 +342,7 @@ namespace Avalonia.Controls
 
             if (menuItem != null && menuItem.Parent == this)
             {
-                foreach (var child in Items.OfType<MenuItem>())
+                foreach (var child in ((IMenuItem)this).SubItems)
                 {
                     if (child != menuItem && child.IsSubMenuOpen)
                     {
@@ -368,12 +368,9 @@ namespace Avalonia.Controls
         /// </summary>
         private void CloseSubmenus()
         {
-            if (Items != null)
+            foreach (var child in ((IMenuItem)this).SubItems)
             {
-                foreach (var child in Items.OfType<MenuItem>())
-                {
-                    child.IsSubMenuOpen = false;
-                }
+                child.IsSubMenuOpen = false;
             }
         }