sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-03 01:09:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-carousel-root-selects-from-nothing

Browse Source
This commit is contained in:
Dan Balasescu
2020-03-23 11:34:04 +09:00
committed by GitHub
parent 448e5c0deb 4fbf94f963
commit d0c7b49376
3 changed files with 73 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Screens/Select/BeatmapCarousel.cs
View File

@ -333,8 +333,7 @@ namespace osu.Game.Screens.Select
else
set = visibleSets.ElementAt(RNG.Next(visibleSets.Count));
var visibleBeatmaps = set.Beatmaps.Where(s => !s.Filtered.Value).ToList();
select(visibleBeatmaps[RNG.Next(visibleBeatmaps.Count)]);
select(set);
return true;
}
@ -760,7 +759,7 @@ namespace osu.Game.Screens.Select
protected override void PerformSelection()
{
if (LastSelected == null)
if (LastSelected == null || LastSelected.Filtered.Value)
carousel?.SelectNextRandom();
else
base.PerformSelection();