sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-13 01:27:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5381 from peppy/fix-leaderboard-display-crash

Browse Source 
Fix potential crash when displaying leaderbaords
This commit is contained in:
Dean Herbert 2019-07-17 22:00:45 +09:00 committed by GitHub
commit bee30b18d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,7 +51,6 @@ namespace osu.Game.Online.Leaderboards
loading.Hide(); loading.Hide();
// schedule because we may not be loaded yet (LoadComponentAsync complains).
showScoresDelegate?.Cancel(); showScoresDelegate?.Cancel();
showScoresCancellationSource?.Cancel(); showScoresCancellationSource?.Cancel();
@ -61,28 +60,22 @@ namespace osu.Game.Online.Leaderboards
// ensure placeholder is hidden when displaying scores // ensure placeholder is hidden when displaying scores
PlaceholderState = PlaceholderState.Successful; PlaceholderState = PlaceholderState.Successful;
scrollFlow = CreateScoreFlow(); var sf = CreateScoreFlow();
scrollFlow.ChildrenEnumerable = scores.Select((s, index) => CreateDrawableScore(s, index + 1)); sf.ChildrenEnumerable = scores.Select((s, index) => CreateDrawableScore(s, index + 1));
if (!IsLoaded) // schedule because we may not be loaded yet (LoadComponentAsync complains).
showScoresDelegate = Schedule(showScores); showScoresDelegate = Schedule(() => LoadComponentAsync(sf, _ =>
else
showScores();
void showScores() => LoadComponentAsync(scrollFlow, _ =>
{ {
scrollContainer.Add(scrollFlow); scrollContainer.Add(scrollFlow = sf);
int i = 0; int i = 0;
foreach (var s in scrollFlow.Children) foreach (var s in scrollFlow.Children)
{
using (s.BeginDelayedSequence(i++ * 50, true)) using (s.BeginDelayedSequence(i++ * 50, true))
s.Show(); s.Show();
}
scrollContainer.ScrollTo(0f, false); scrollContainer.ScrollTo(0f, false);
}, (showScoresCancellationSource = new CancellationTokenSource()).Token); }, (showScoresCancellationSource = new CancellationTokenSource()).Token));
} }
} }