From 9a66d766e995474f95a5d68773cc8d6430aaaf4a Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Fri, 14 Oct 2016 13:32:08 +0900 Subject: [PATCH] Don't bail on no beatmaps in database. --- osu.Game/GameModes/Play/PlaySongSelect.cs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/osu.Game/GameModes/Play/PlaySongSelect.cs b/osu.Game/GameModes/Play/PlaySongSelect.cs index 9788debc9f..6353848607 100644 --- a/osu.Game/GameModes/Play/PlaySongSelect.cs +++ b/osu.Game/GameModes/Play/PlaySongSelect.cs @@ -51,6 +51,9 @@ private void addBeatmapSet(BeatmapSet beatmapSet) private void addBeatmapSets() { var sets = beatmaps.GetBeatmapSets(); + + if (sets.Length == 0) return; + foreach (var beatmapSet in sets) addBeatmapSet(beatmapSet); } @@ -112,9 +115,12 @@ public override void Load(BaseGame game) beatmaps = (game as OsuGameBase).Beatmaps; beatmaps.BeatmapSetAdded += bset => Scheduler.Add(() => addBeatmapSet(bset)); addBeatmapSets(); - var first = setList.Children.First() as BeatmapGroup; - first.Collapsed = false; - selectedBeatmapSet = first.BeatmapSet; + var first = setList.Children.FirstOrDefault() as BeatmapGroup; + if (first != null) + { + first.Collapsed = false; + selectedBeatmapSet = first.BeatmapSet; + } } protected override void Dispose(bool isDisposing)