diff --git a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs index 62bd292710..5574dd69a1 100644 --- a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs +++ b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs @@ -24,7 +24,7 @@ using System.Net; using osu.Game.Rulesets; using osu.Framework.Input; -using osu.Game.Beatmaps.ControlPoints; +using osu.Game.Beatmaps.ControlPoints; using osu.Framework.Audio.Track; namespace osu.Game.Screens.Select.Leaderboards @@ -51,7 +51,6 @@ public IEnumerable Scores set { scores = value; - getScoresRequest?.Cancel(); getScoresRequest = null; placeholderContainer.FadeOut(fade_duration); @@ -202,6 +201,8 @@ private void updateScores() { if (!IsLoaded) return; + getScoresRequest?.Cancel(); + Scores = null; if (api == null || Beatmap?.OnlineBeatmapID == null) return; @@ -318,7 +319,7 @@ protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, icon.RotateTo(rightWard ? 3 : -3, duration * 2, Easing.OutCubic); icon.Animate( i => i.MoveToY(-3, duration, Easing.Out), - i => i.ScaleTo(IsHovered ? 1.3f : 1.1f, duration, Easing.Out) + i => i.ScaleTo(IsHovered ? 1.3f : 1.1f, duration, Easing.Out) ).Then( i => i.MoveToY(0, duration, Easing.In), i => i.ScaleTo(IsHovered ? 1.4f : 1f, duration, Easing.In) @@ -350,7 +351,7 @@ protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) protected override bool OnMouseUp(InputState state, MouseUpEventArgs args) { - icon.ScaleTo(1.2f, 400, Easing.OutElastic).Then().ScaleTo(1f, 400, Easing.OutElastic); + icon.ScaleTo(1.2f, 400, Easing.OutElastic); return base.OnMouseUp(state, args); } }