h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-05-19 16:20:14 +08:00
Code Issues Releases Wiki Activity

Fix multiple issues causing song select to retain a deleted or hidden selection

Browse Source
This commit is contained in:
Dean Herbert
2025-05-29 00:35:06 +09:00
Unverified
parent 5d5a569523
commit 8f18336b2c
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game/Screens/SelectV2/SongSelect.cs
+13 -4
View File
@@ -566,11 +566,20 @@ namespace osu.Game.Screens.SelectV2
// but also in this case we want support for formatting a number within a string).
filterControl.StatusText = count != 1 ? $"{count:#,0} matches" : $"{count:#,0} match";
// Importantly, if all results are filtered away don't deselect the current global beatmap selection.
if (!carouselItems.Any())
return;
// Refetch to be confident that the current selection is still valid. It may have been deleted or hidden.
var currentBeatmap = beatmaps.GetWorkingBeatmap(Beatmap.Value.BeatmapInfo, true);
bool currentBeatmapNotValid = currentBeatmap.BeatmapInfo.Hidden || currentBeatmap.BeatmapSetInfo?.DeletePending == true;
if (Beatmap.IsDefault || Beatmap.Value.BeatmapSetInfo?.DeletePending == true)
// If all results are filtered away don't deselect the current global beatmap selection...
if (!carouselItems.Any())
{
// ...unless it has been deleted or hidden
if (currentBeatmapNotValid)
Beatmap.SetDefault();
return;
}
if (Beatmap.IsDefault || currentBeatmapNotValid)
// TODO: this should probably use random, not recommended like this.
selectRecommendedBeatmap(carouselItems.Select(i => i.Model).OfType<BeatmapInfo>());
}