1
0
mirror of https://github.com/ppy/osu.git synced 2025-02-19 23:22:56 +08:00

Merge remote-tracking branch 'upstream/master' into overlay-headers-update-three

This commit is contained in:
Dean Herbert 2020-01-03 15:35:33 +09:00
commit 7d79edf335

View File

@ -158,7 +158,8 @@ namespace osu.Game.Overlays
private Task initialFetchTask; private Task initialFetchTask;
private void performAfterFetch(Action action) => fetchListing()?.ContinueWith(_ => Schedule(action)); private void performAfterFetch(Action action) => fetchListing()?.ContinueWith(_ =>
Schedule(action), TaskContinuationOptions.OnlyOnRanToCompletion);
private Task fetchListing() private Task fetchListing()
{ {
@ -185,10 +186,10 @@ namespace osu.Game.Overlays
tcs.SetResult(true); tcs.SetResult(true);
}); });
req.Failure += _ => req.Failure += e =>
{ {
initialFetchTask = null; initialFetchTask = null;
tcs.SetResult(false); tcs.SetException(e);
}; };
await API.PerformAsync(req); await API.PerformAsync(req);