Merge remote-tracking branch 'upstream/master' into installer-updater

This commit is contained in:
Dean Herbert 2017-02-12 16:30:12 +09:00
commit 3d65c468ae
2 changed files with 2 additions and 2 deletions

View File

@ -30,7 +30,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
{

View File

@ -84,7 +84,7 @@ namespace osu.Game.Screens.Backgrounds
[BackgroundDependencyLoader]
private void load()
{
Sprite.Texture = beatmap.Background;
Sprite.Texture = beatmap?.Background;
}
}
}