mirror of
https://github.com/ppy/osu.git
synced 2024-12-15 05:02:55 +08:00
Merge branch 'master' into user-hide-toolbar-forever
This commit is contained in:
commit
6438a7ee12
@ -21,6 +21,8 @@ namespace osu.Game.Overlays
|
||||
{
|
||||
public class ChangelogOverlay : OnlineOverlay<ChangelogHeader>
|
||||
{
|
||||
public override bool IsPresent => base.IsPresent || Scheduler.HasPendingTasks;
|
||||
|
||||
public readonly Bindable<APIChangelogBuild> Current = new Bindable<APIChangelogBuild>();
|
||||
|
||||
private Sample sampleBack;
|
||||
@ -126,8 +128,11 @@ namespace osu.Game.Overlays
|
||||
|
||||
private Task initialFetchTask;
|
||||
|
||||
private void performAfterFetch(Action action) => fetchListing()?.ContinueWith(_ =>
|
||||
Schedule(action), TaskContinuationOptions.OnlyOnRanToCompletion);
|
||||
private void performAfterFetch(Action action) => Schedule(() =>
|
||||
{
|
||||
fetchListing()?.ContinueWith(_ =>
|
||||
Schedule(action), TaskContinuationOptions.OnlyOnRanToCompletion);
|
||||
});
|
||||
|
||||
private Task fetchListing()
|
||||
{
|
||||
@ -163,7 +168,7 @@ namespace osu.Game.Overlays
|
||||
await API.PerformAsync(req).ConfigureAwait(false);
|
||||
|
||||
return tcs.Task;
|
||||
});
|
||||
}).Unwrap();
|
||||
}
|
||||
|
||||
private CancellationTokenSource loadContentCancellation;
|
||||
|
Loading…
Reference in New Issue
Block a user