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

Fix memory leak from Player's InputManager.

Browse Source
This commit is contained in:
Dean Herbert 2017-02-24 20:59:21 +09:00
parent 65a24dfe5d
commit 5096f6b83d
No known key found for this signature in database
GPG Key ID: 46D71BF4958ABB49
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
osu.Game/Screens/Play/Player.cs
View File

@ -222,6 +222,12 @@ namespace osu.Game.Screens.Play
if (IsPaused) Pause(); else Resume(); if (IsPaused) Pause(); else Resume();
} }
protected override void Dispose(bool isDisposing)
{
base.Dispose(isDisposing);
playerInputManager?.Dispose();
}
public void Restart() public void Restart()
{ {
sourceClock.Stop(); // If the clock is running and Restart is called the game will lag until relaunch sourceClock.Stop(); // If the clock is running and Restart is called the game will lag until relaunch
@ -312,6 +318,9 @@ namespace osu.Game.Screens.Play
} }
else else
{ {
FadeOut(250);
Content.ScaleTo(0.7f, 750, EasingTypes.InQuint);
dimLevel.ValueChanged -= dimChanged; dimLevel.ValueChanged -= dimChanged;
Background?.FadeTo(1f, 200); Background?.FadeTo(1f, 200);
return base.OnExiting(next); return base.OnExiting(next);

6
osu.Game/Screens/Play/PlayerLoader.cs
View File

@ -89,6 +89,12 @@ namespace osu.Game.Screens.Play
{ {
Content.ScaleTo(0.7f, 150, EasingTypes.InQuint); Content.ScaleTo(0.7f, 150, EasingTypes.InQuint);
FadeOut(150); FadeOut(150);
//this is required to clean up the InputManager in Player.
//can be removed once we solve that one.
if (player != null && player.LoadState != LoadState.Alive)
player.Dispose();
return base.OnExiting(next); return base.OnExiting(next);
} }