From b79fdfc12f2d65da2f0fd80b68fa58aa2aa11882 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 Jun 2019 13:48:58 +0900
Subject: [PATCH] Fix one more instance of improperly handled cancellation

---
 osu.Game/Beatmaps/BeatmapManager.cs      | 3 +--
 osu.Game/Database/ArchiveModelManager.cs | 4 ++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 9e7b6d7971..cfc6a0be28 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -436,8 +436,7 @@ namespace osu.Game.Beatmaps
 
             private void perform(BeatmapInfo beatmap, CancellationToken cancellation)
             {
-                if (cancellation.IsCancellationRequested)
-                    return;
+                cancellation.ThrowIfCancellationRequested();
 
                 if (api?.State != APIState.Online)
                     return;
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 1d576ff82f..df96d9984a 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -361,6 +361,10 @@ namespace osu.Game.Database
 
                 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);