Merge branch 'master' into remove-duplicated-load

This commit is contained in:
recapitalverb
2020-02-15 12:10:34 +07:00
committed by GitHub
18 changed files with 1080 additions and 160 deletions

View File

@ -45,7 +45,7 @@ namespace osu.Game.Overlays.Direct
[BackgroundDependencyLoader(true)]
private void load(OsuGame game, BeatmapManager beatmaps)
{
if (BeatmapSet.Value.OnlineInfo.Availability?.DownloadDisabled ?? false)
if (BeatmapSet.Value?.OnlineInfo?.Availability?.DownloadDisabled ?? false)
{
button.Enabled.Value = false;
button.TooltipText = "this beatmap is currently not available for download.";
@ -62,7 +62,7 @@ namespace osu.Game.Overlays.Direct
break;
case DownloadState.LocallyAvailable:
game.PresentBeatmap(BeatmapSet.Value);
game?.PresentBeatmap(BeatmapSet.Value);
break;
default: