Handle non-alive menu items during addition/removal

frenzibyte · Nov 24, 2023 · 6e483d7 · 6e483d7
1 parent f4f4e31
commit 6e483d7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/osu.Framework/Graphics/UserInterface/Menu.cs b/osu.Framework/Graphics/UserInterface/Menu.cs
@@ -293,7 +293,7 @@ public void Insert(int position, MenuItem item)
 
             drawableItem.SetFlowDirection(Direction);
 
-            var items = ItemsContainer.FlowingChildren.Cast<DrawableMenuItem>().ToList();
+            var items = Children.OrderBy(ItemsContainer.GetLayoutPosition).ToList();
 
             for (int i = position; i < items.Count; i++)
                 ItemsContainer.SetLayoutPosition(items[i], i + 1);
@@ -318,7 +318,7 @@ private void itemStateChanged(DrawableMenuItem item, MenuItemState state)
         /// <returns>Whether <paramref name="item"/> was successfully removed.</returns>
         public bool Remove(MenuItem item)
         {
-            var items = ItemsContainer.FlowingChildren.Cast<DrawableMenuItem>().ToList();
+            var items = Children.OrderBy(ItemsContainer.GetLayoutPosition).ToList();
             bool removed = false;
 
             for (int i = 0; i < items.Count; i++)