Merge branch 'master' into maybefix

This commit is contained in:
Dean Herbert
2017-09-11 18:23:00 +09:00
committed by GitHub
110 changed files with 1813 additions and 734 deletions

View File

@ -54,7 +54,7 @@ namespace osu.Game.Beatmaps
{
if (beatmap != null) return beatmap;
beatmap = GetBeatmap();
beatmap = GetBeatmap() ?? new Beatmap();
// use the database-backed info.
beatmap.BeatmapInfo = BeatmapInfo;