sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-24 15:07:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into changelog-overlay

Browse Source
This commit is contained in:
Dean Herbert 2019-05-24 11:13:48 +09:00 committed by GitHub
commit cc256614b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs
View File

@ -32,6 +32,7 @@ namespace osu.Game.Beatmaps.Drawables
protected virtual double UnloadDelay => 10000; protected virtual double UnloadDelay => 10000;
private BeatmapInfo lastModel; private BeatmapInfo lastModel;
private bool firstLoad = true;
protected override DelayedLoadWrapper CreateDelayedLoadWrapper(Drawable content, double timeBeforeLoad) protected override DelayedLoadWrapper CreateDelayedLoadWrapper(Drawable content, double timeBeforeLoad)
{ {
@ -39,11 +40,12 @@ namespace osu.Game.Beatmaps.Drawables
{ {
// If DelayedLoadUnloadWrapper is attempting to RELOAD the same content (Beatmap), that means that it was // If DelayedLoadUnloadWrapper is attempting to RELOAD the same content (Beatmap), that means that it was
// previously UNLOADED and thus its children have been disposed of, so we need to recreate them here. // previously UNLOADED and thus its children have been disposed of, so we need to recreate them here.
if (lastModel == Beatmap.Value) if (!firstLoad && lastModel == Beatmap.Value)
return CreateDrawable(Beatmap.Value); return CreateDrawable(Beatmap.Value);
// If the model has changed since the previous unload (or if there was no load), then we can safely use the given content // If the model has changed since the previous unload (or if there was no load), then we can safely use the given content
lastModel = Beatmap.Value; lastModel = Beatmap.Value;
firstLoad = false;
return content; return content;
}, timeBeforeLoad, UnloadDelay); }, timeBeforeLoad, UnloadDelay);
} }