Merge branch 'master' into osb_loading

This commit is contained in:
Thomas Müller
2017-02-12 12:26:25 +01:00
committed by GitHub
48 changed files with 1685 additions and 87 deletions

View File

@ -32,7 +32,7 @@ namespace osu.Game.Beatmaps
{
if (background != null) return background;
if (BeatmapInfo.Metadata?.BackgroundFile == null) return null;
if (BeatmapInfo?.Metadata?.BackgroundFile == null) return null;
try
{