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

Merge branch 'master' into overall-difficulty

Browse Source
This commit is contained in:
Dan Balasescu 2018-01-22 13:50:37 +09:00 committed by GitHub
commit 81635c8310
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 8f36ddab946ff538620081ede7719461d4732b79
Subproject commit 26c01ca6069296621f76d8ffbfe31ecf8074c687

2
osu.Game/Overlays/Direct/DirectPanel.cs
View File

@ -106,6 +106,8 @@ namespace osu.Game.Overlays.Direct
beatmaps.BeatmapDownloadBegan += attachDownload;
}
public override bool DisposeOnDeathRemoval => true;
protected override void Dispose(bool isDisposing)
{
base.Dispose(isDisposing);

6
osu.Game/Overlays/Direct/PlayButton.cs
View File

@ -145,6 +145,12 @@ namespace osu.Game.Overlays.Direct
}
}
protected override void Dispose(bool isDisposing)
{
base.Dispose(isDisposing);
Playing.Value = false;
}
private TrackLoader trackLoader;
private AudioManager audio;