1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-15 19:02:57 +08:00

Merge branch 'master' into cinema-mod

This commit is contained in:
Albie 2019-11-25 13:35:14 +00:00 committed by GitHub
commit 87ee3f1083
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -1,5 +1,5 @@
{ {
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.Build.Traversal": "2.0.19" "Microsoft.Build.Traversal": "2.0.24"
} }
} }

View File

@ -73,7 +73,7 @@ namespace osu.Game.Screens.Backgrounds
Schedule(() => Schedule(() =>
{ {
if ((Background as BeatmapBackground)?.Beatmap == beatmap) if ((Background as BeatmapBackground)?.Beatmap.BeatmapInfo.BackgroundEquals(beatmap?.BeatmapInfo) ?? false)
return; return;
cancellationSource?.Cancel(); cancellationSource?.Cancel();