Fix: Intersection breaking with more than 2 collections selected

Piotrekol · Apr 16, 2021 · 1155afc · 1155afc
1 parent e4dadd7
commit 1155afc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/App/CollectionEditor.cs b/App/CollectionEditor.cs
@@ -53,7 +53,7 @@ public void EditCollection(CollectionEditArgs e)
                 if (e.Collections.Count < 2)
                     return;
 
-                var newCollection = new Collection(_mapCacher) { Name = GetValidCollectionName(e.Collections[0].Name) };
+                var newCollection = new Collection(_mapCacher) { Name = GetValidCollectionName(e.NewName) };
                 e.Collections.Add(newCollection);
             }
             else if (e.Action == CollectionEdit.Duplicate)

diff --git a/CollectionManagerDll/Modules/CollectionsManager/CollectionsManager.cs b/CollectionManagerDll/Modules/CollectionsManager/CollectionsManager.cs
@@ -90,13 +90,15 @@ private void EditCollection(CollectionEditArgs args, bool suspendRefresh = false
                 args.Collections.RemoveAt(args.Collections.Count - 1);
                 var mainCollection = args.Collections[0];
                 args.Collections.RemoveAt(0);
-
+                var beatmaps = mainCollection.AllBeatmaps().ToList();
                 foreach (var collection in args.Collections)
                 {
-                    foreach (var beatmap in mainCollection.AllBeatmaps().Intersect(collection.AllBeatmaps(), new CollectionBeatmapComparer()))
-                    {
-                        targetCollection.AddBeatmap(beatmap);
-                    }
+                    beatmaps = beatmaps.Intersect(collection.AllBeatmaps(), new CollectionBeatmapComparer()).ToList();
+                }
+
+                foreach (var beatmap in beatmaps)
+                {
+                    targetCollection.AddBeatmap(beatmap);
                 }
 
                 EditCollection(CollectionEditArgs.AddCollections(new Collections() { targetCollection }), true);