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

Fix one more instance of improperly handled cancellation

Browse Source
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 @@ namespace osu.Game.Beatmaps
private void perform(BeatmapInfo beatmap, CancellationToken cancellation) private void perform(BeatmapInfo beatmap, CancellationToken cancellation)
{ {
if (cancellation.IsCancellationRequested) cancellation.ThrowIfCancellationRequested();
return;
if (api?.State != APIState.Online) if (api?.State != APIState.Online)
return; return;

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

@ -361,6 +361,10 @@ namespace osu.Game.Database
Logger.Log($"Import of {item} successfully completed!", LoggingTarget.Database); Logger.Log($"Import of {item} successfully completed!", LoggingTarget.Database);
} }
catch (TaskCanceledException)
{
throw;
}
catch (Exception e) catch (Exception e)
{ {
Logger.Error(e, $"Import of {item} failed and has been rolled back.", LoggingTarget.Database); Logger.Error(e, $"Import of {item} failed and has been rolled back.", LoggingTarget.Database);