Merge remote-tracking branch 'upstream/master' into warning_fixes

This commit is contained in:
Dean Herbert
2017-02-28 13:49:19 +09:00
35 changed files with 195 additions and 179 deletions

View File

@ -64,7 +64,7 @@ namespace osu.Game.Beatmaps.Drawables
BeatmapSet = beatmapSet;
WorkingBeatmap beatmap = database.GetWorkingBeatmap(BeatmapSet.Beatmaps.FirstOrDefault());
foreach (var b in BeatmapSet.Beatmaps)
b.StarDifficulty = (float)database.GetWorkingBeatmap(b).Beatmap.CalculateStarDifficulty();
b.StarDifficulty = (float)(database.GetWorkingBeatmap(b).Beatmap?.CalculateStarDifficulty() ?? 0);
Header = new BeatmapSetHeader(beatmap)
{