Fix RearrangeableListContainer crashing on range replacements

smoogipoo · Nov 14, 2024 · 240399f · 240399f
1 parent 9e38585
commit 240399f
Showing 1 changed file with 11 additions and 13 deletions.
diff --git a/osu.Framework/Graphics/Containers/RearrangeableListContainer.cs b/osu.Framework/Graphics/Containers/RearrangeableListContainer.cs
@@ -103,19 +103,16 @@ private void collectionChanged(object sender, NotifyCollectionChangedEventArgs e
                     currentlyDraggedItem = null;
                     ListContainer.Clear();
                     itemMap.Clear();
-                    OnItemsChanged();
                     break;
 
                 case NotifyCollectionChangedAction.Replace:
                     removeItems(e.OldItems);
                     addItems(e.NewItems);
                     break;
-
-                case NotifyCollectionChangedAction.Move:
-                    sortItems();
-                    OnItemsChanged();
-                    break;
             }
+
+            sortItems();
+            OnItemsChanged();
         }
 
         private void removeItems(IList items)
@@ -132,9 +129,6 @@ private void removeItems(IList items)
 
                 itemMap.Remove(item);
             }
-
-            sortItems();
-            OnItemsChanged();
         }
 
         private void addItems(IList items)
@@ -163,7 +157,14 @@ private void addItems(IList items)
             if (!IsLoaded)
                 addToHierarchy(drawablesToAdd);
             else
-                LoadComponentsAsync(drawablesToAdd, addToHierarchy);
+            {
+                LoadComponentsAsync(drawablesToAdd, d =>
+                {
+                    addToHierarchy(d);
+                    sortItems();
+                    OnItemsChanged();
+                });
+            }
 
             void addToHierarchy(IEnumerable<Drawable> drawables)
             {
@@ -173,9 +174,6 @@ void addToHierarchy(IEnumerable<Drawable> drawables)
                     if (itemMap.TryGetValue(d.Model, out var modelDrawable) && modelDrawable == d)
                         ListContainer.Add(d);
                 }
-
-                sortItems();
-                OnItemsChanged();
             }
         }