RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-02-06 13:22:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #25839 from bdach/collection-name-clashes-crashes

Browse Source 
Fix crash when creating collections named "All beatmaps" or "Manage collections..."
This commit is contained in:
Dean Herbert 2023-12-19 00:32:18 +09:00 committed by GitHub
commit da658bbf25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
View File

@ -166,6 +166,29 @@ namespace osu.Game.Tests.Visual.Collections
})));
}
[Test]
public void TestCollectionNameCollisionsWithBuiltInItems()
{
AddStep("add dropdown", () =>
{
Add(new CollectionDropdown
{
Anchor = Anchor.TopRight,
Origin = Anchor.TopRight,
RelativeSizeAxes = Axes.X,
Width = 0.4f,
});
});
AddStep("add two collections which collide with default items", () => Realm.Write(r => r.Add(new[]
{
new BeatmapCollection(name: "All beatmaps"),
new BeatmapCollection(name: "Manage collections...")
{
BeatmapMD5Hashes = { beatmapManager.GetAllUsableBeatmapSets().First().Beatmaps[0].MD5Hash }
},
})));
}
[Test]
public void TestRemoveCollectionViaButton()
{

25
osu.Game/Collections/CollectionFilterMenuItem.cs
View File

@ -37,22 +37,17 @@ namespace osu.Game.Collections
CollectionName = name;
}
public bool Equals(CollectionFilterMenuItem? other)
public virtual bool Equals(CollectionFilterMenuItem? other)
{
if (other == null)
return false;
if (ReferenceEquals(null, other)) return false;
if (ReferenceEquals(this, other)) return true;
// collections may have the same name, so compare first on reference equality.
// this relies on the assumption that only one instance of the BeatmapCollection exists game-wide, managed by CollectionManager.
if (Collection != null)
return Collection.ID == other.Collection?.ID;
if (Collection == null) return false;
// fallback to name-based comparison.
// this is required for special dropdown items which don't have a collection (all beatmaps / manage collections items below).
return CollectionName == other.CollectionName;
return Collection.ID == other.Collection?.ID;
}
public override int GetHashCode() => CollectionName.GetHashCode();
public override int GetHashCode() => Collection?.ID.GetHashCode() ?? 0;
}
public class AllBeatmapsCollectionFilterMenuItem : CollectionFilterMenuItem
@ -61,6 +56,10 @@ namespace osu.Game.Collections
: base("All beatmaps")
{
}
public override bool Equals(CollectionFilterMenuItem? other) => other is AllBeatmapsCollectionFilterMenuItem;
public override int GetHashCode() => 1;
}
public class ManageCollectionsFilterMenuItem : CollectionFilterMenuItem
@ -69,5 +68,9 @@ namespace osu.Game.Collections
: base("Manage collections...")
{
}
public override bool Equals(CollectionFilterMenuItem? other) => other is ManageCollectionsFilterMenuItem;
public override int GetHashCode() => 2;
}
}