From d1f64cfbfcbe24bd304f754837e6983cb2db5e46 Mon Sep 17 00:00:00 2001 From: Huo Yaoyuan Date: Mon, 7 Nov 2016 21:30:25 +0800 Subject: [PATCH] Make external changes into history. --- osu.Game/Overlays/MusicController.cs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs index c9099921cf..043ae6e795 100644 --- a/osu.Game/Overlays/MusicController.cs +++ b/osu.Game/Overlays/MusicController.cs @@ -213,7 +213,8 @@ namespace osu.Game.Overlays { if (beatmapSource.Value == current) return; current = beatmapSource.Value; - updateCurrent(current, null); + updateCurrent(current, true); + appendToHistory(current.BeatmapInfo); } private void appendToHistory(BeatmapInfo beatmap) @@ -248,7 +249,7 @@ namespace osu.Game.Overlays } } - private void play(BeatmapInfo info, bool? isNext) + private void play(BeatmapInfo info, bool isNext) { current = database.GetWorkingBeatmap(info, current); Task.Run(() => @@ -260,7 +261,7 @@ namespace osu.Game.Overlays updateCurrent(current, isNext); } - private void updateCurrent(WorkingBeatmap beatmap, bool? isNext) + private void updateCurrent(WorkingBeatmap beatmap, bool isNext) { BeatmapMetadata metadata = beatmap.Beatmap.Metadata; title.Text = metadata.TitleUnicode ?? metadata.Title; @@ -270,13 +271,13 @@ namespace osu.Game.Overlays Add(newBackground); - if (isNext == true) + if (isNext) { newBackground.Position = new Vector2(400, 0); newBackground.MoveToX(0, 500, EasingTypes.OutCubic); backgroundSprite.MoveToX(-400, 500, EasingTypes.OutCubic); } - else if (isNext == false) + else { newBackground.Position = new Vector2(-400, 0); newBackground.MoveToX(0, 500, EasingTypes.OutCubic);