RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix one more instance of improperly handled cancellation

This commit is contained in:
Dean Herbert 2019-06-10 13:48:58 +09:00
parent e12b03e275
commit b79fdfc12f
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/Beatmaps/BeatmapManager.cs
View File

@ -436,8 +436,7 @@ public Task Perform(BeatmapInfo beatmap, CancellationToken cancellationToken)
private void perform(BeatmapInfo beatmap, CancellationToken cancellation)
{
if (cancellation.IsCancellationRequested)
return;
cancellation.ThrowIfCancellationRequested();
if (api?.State != APIState.Online)
return;

4
osu.Game/Database/ArchiveModelManager.cs
View File

@ -361,6 +361,10 @@ public async Task<TModel> Import(TModel item, ArchiveReader archive = null, Canc
Logger.Log($"Import of {item} successfully completed!", LoggingTarget.Database);
}
catch (TaskCanceledException)
{
throw;
}
catch (Exception e)
{
Logger.Error(e, $"Import of {item} failed and has been rolled back.", LoggingTarget.Database);