RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix crash when creating collections named "All beatmaps" or "Manage collections..." 

Closes https://github.com/ppy/osu/issues/25834

The name fallback that was there previously since
https://github.com/ppy/osu/pull/11892 was half broken. This way should
be a lot less prone to failure.
This commit is contained in:
Bartłomiej Dach 2023-12-18 12:52:06 +01:00
parent be16e0e538
commit eeeb5aa3d4
No known key found for this signature in database
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,22 +37,17 @@ protected CollectionFilterMenuItem(string name)
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 @@ public AllBeatmapsCollectionFilterMenuItem()
: 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 @@ public ManageCollectionsFilterMenuItem()
: base("Manage collections...")
{
}
public override bool Equals(CollectionFilterMenuItem? other) => other is ManageCollectionsFilterMenuItem;
public override int GetHashCode() => 2;
}
}