RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-14 19:06:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'split-out-music-controller' into music-controller-hotkeys

Browse Source
This commit is contained in:
Dean Herbert 2019-08-13 15:08:33 +09:00
commit 6a70849acb
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
osu.Game/Overlays/NowPlayingOverlay.cs
View File

@ -247,13 +247,6 @@ namespace osu.Game.Overlays
} }
} }
protected override void Dispose(bool isDisposing)
{
base.Dispose(isDisposing);
musicController.TrackChanged -= trackChanged;
}
private Action pendingBeatmapSwitch; private Action pendingBeatmapSwitch;
private void trackChanged(WorkingBeatmap beatmap, TrackChangeDirection direction = TrackChangeDirection.None) private void trackChanged(WorkingBeatmap beatmap, TrackChangeDirection direction = TrackChangeDirection.None)
@ -313,6 +306,14 @@ namespace osu.Game.Overlays
playlistButton.Enabled.Value = !disabled; playlistButton.Enabled.Value = !disabled;
} }
protected override void Dispose(bool isDisposing)
{
base.Dispose(isDisposing);
if (musicController != null)
musicController.TrackChanged -= trackChanged;
}
private class MusicIconButton : IconButton private class MusicIconButton : IconButton
{ {
public MusicIconButton() public MusicIconButton()