h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 20:33:37 +08:00
Code Issues Releases Wiki Activity

Merge pull request #334 from peppy/memory-fixes

Browse Source 
Fix major memory leak when MusicController is hidden
This commit is contained in:
Thomas Müller 2017-02-09 08:34:41 +01:00 committed by GitHub
commit 6f45217b02
1 changed files with 46 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
osu.Game/Overlays/MusicController.cs
View File

@ -23,6 +23,7 @@ using osu.Game.Configuration;
using osu.Game.Database; using osu.Game.Database;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Framework.Graphics.Primitives; using osu.Framework.Graphics.Primitives;
using osu.Framework.Threading;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
namespace osu.Game.Overlays namespace osu.Game.Overlays
@ -229,6 +230,12 @@ namespace osu.Game.Overlays
{ {
base.Update(); base.Update();
if (pendingBeatmapSwitch != null)
{
pendingBeatmapSwitch();
pendingBeatmapSwitch = null;
}
if (current?.TrackLoaded ?? false) if (current?.TrackLoaded ?? false)
{ {
@ -320,7 +327,13 @@ namespace osu.Game.Overlays
base.PerformLoad(game); base.PerformLoad(game);
} }
Action pendingBeatmapSwitch;
private void updateDisplay(WorkingBeatmap beatmap, TransformDirection direction) private void updateDisplay(WorkingBeatmap beatmap, TransformDirection direction)
{
//we might be off-screen when this update comes in.
//rather than Scheduling, manually handle this to avoid possible memory contention.
pendingBeatmapSwitch = () =>
{ {
Task.Run(() => Task.Run(() =>
{ {
@ -357,6 +370,7 @@ namespace osu.Game.Overlays
backgroundSprite.Expire(); backgroundSprite.Expire();
backgroundSprite = newBackground; backgroundSprite = newBackground;
}); });
};
} }
private Func<string, string, string> unicodeString; private Func<string, string, string> unicodeString;