h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-29 03:43:00 +08:00
Code Issues Releases Wiki Activity

Merge pull request #10104 from smoogipoo/leaderboard-loading-spinner-fix

Browse Source 
Fix leaderboard loading spinner disappearing too early
This commit is contained in:
Dean Herbert 2020-09-09 22:49:27 +09:00 committed by GitHub
commit aa2be09d4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Online/Leaderboards/Leaderboard.cs
View File

@ -56,13 +56,14 @@ namespace osu.Game.Online.Leaderboards
scrollFlow?.FadeOut(fade_duration, Easing.OutQuint).Expire(); scrollFlow?.FadeOut(fade_duration, Easing.OutQuint).Expire();
scrollFlow = null; scrollFlow = null;
loading.Hide();
showScoresDelegate?.Cancel(); showScoresDelegate?.Cancel();
showScoresCancellationSource?.Cancel(); showScoresCancellationSource?.Cancel();
if (scores == null || !scores.Any()) if (scores == null || !scores.Any())
{
loading.Hide();
return; return;
}
// ensure placeholder is hidden when displaying scores // ensure placeholder is hidden when displaying scores
PlaceholderState = PlaceholderState.Successful; PlaceholderState = PlaceholderState.Successful;
@ -84,6 +85,7 @@ namespace osu.Game.Online.Leaderboards
} }
scrollContainer.ScrollTo(0f, false); scrollContainer.ScrollTo(0f, false);
loading.Hide();
}, (showScoresCancellationSource = new CancellationTokenSource()).Token)); }, (showScoresCancellationSource = new CancellationTokenSource()).Token));
} }
} }