diff --git a/osu.Game/Database/LegacyExporter.cs b/osu.Game/Database/LegacyExporter.cs index a8d2fb116c..906e2083ff 100644 --- a/osu.Game/Database/LegacyExporter.cs +++ b/osu.Game/Database/LegacyExporter.cs @@ -99,11 +99,13 @@ namespace osu.Game.Database PostNotification?.Invoke(notification); + using var linkedSource = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, notification.CancellationToken); + try { using (var stream = exportStorage.CreateFileSafely(filename)) { - await ExportToStreamAsync(model, stream, notification, cancellationToken == CancellationToken.None ? notification.CancellationToken : cancellationToken).ConfigureAwait(false); + await ExportToStreamAsync(model, stream, notification, linkedSource.Token).ConfigureAwait(false); } } catch