Fix hitting down and enter at song select causing a hard-crash

Carousel was not aware of the disabled beatmap change state. Also it was being set too late (in an async load) so wasn't useful. It's now pre-emptively set in PlaySongSelect before loading Player.
This commit is contained in:
Dean Herbert
2017-07-20 11:50:31 +09:00
parent 8417e59de3
commit 15eb6954da
3 changed files with 9 additions and 1 deletions

View File

@ -110,7 +110,7 @@ namespace osu.Game.Screens.Select
Origin = Anchor.CentreRight,
SelectionChanged = carouselSelectionChanged,
BeatmapsChanged = carouselBeatmapsLoaded,
StartRequested = carouselRaisedStart
StartRequested = carouselRaisedStart,
});
Add(FilterControl = new FilterControl
{
@ -185,6 +185,9 @@ namespace osu.Game.Screens.Select
carousel.Beatmaps = database.GetAllWithChildren<BeatmapSetInfo>(b => !b.DeletePending);
Beatmap.ValueChanged += beatmap_ValueChanged;
Beatmap.DisabledChanged += disabled => carousel.AllowSelection = !disabled;
carousel.AllowSelection = !Beatmap.Disabled;
}
private void carouselBeatmapsLoaded()