mirror of
https://github.com/ppy/osu.git
synced 2024-12-15 18:33:22 +08:00
Merge pull request #334 from peppy/memory-fixes
Fix major memory leak when MusicController is hidden
This commit is contained in:
commit
6f45217b02
@ -23,6 +23,7 @@ using osu.Game.Configuration;
|
||||
using osu.Game.Database;
|
||||
using osu.Game.Graphics;
|
||||
using osu.Framework.Graphics.Primitives;
|
||||
using osu.Framework.Threading;
|
||||
using osu.Game.Graphics.Sprites;
|
||||
|
||||
namespace osu.Game.Overlays
|
||||
@ -229,6 +230,12 @@ namespace osu.Game.Overlays
|
||||
{
|
||||
base.Update();
|
||||
|
||||
if (pendingBeatmapSwitch != null)
|
||||
{
|
||||
pendingBeatmapSwitch();
|
||||
pendingBeatmapSwitch = null;
|
||||
}
|
||||
|
||||
if (current?.TrackLoaded ?? false)
|
||||
{
|
||||
|
||||
@ -320,7 +327,13 @@ namespace osu.Game.Overlays
|
||||
base.PerformLoad(game);
|
||||
}
|
||||
|
||||
Action pendingBeatmapSwitch;
|
||||
|
||||
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(() =>
|
||||
{
|
||||
@ -357,6 +370,7 @@ namespace osu.Game.Overlays
|
||||
backgroundSprite.Expire();
|
||||
backgroundSprite = newBackground;
|
||||
});
|
||||
};
|
||||
}
|
||||
|
||||
private Func<string, string, string> unicodeString;
|
||||
|
Loading…
Reference in New Issue
Block a user