h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-28 06:42:54 +08:00
Code Issues Releases Wiki Activity

repair usage of CancellationToken

Browse Source 
Co-Authored-By: n0099 <n@n0099.net>
This commit is contained in:
cdwcgt 2023-04-09 21:54:26 +09:00
parent 1d5c87039e
commit 13b522e825
No known key found for this signature in database
GPG Key ID: 144396D01095C3A2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Database/LegacyModelExporter.cs
View File

@ -60,7 +60,7 @@ namespace osu.Game.Database
/// If specified CancellationToken, then use it. Otherwise use PostNotification's CancellationToken. /// If specified CancellationToken, then use it. Otherwise use PostNotification's CancellationToken.
/// </param> /// </param>
/// <returns></returns> /// <returns></returns>
public async Task<bool> ExportAsync(TModel model, CancellationToken? cancellationToken = null) public async Task<bool> ExportAsync(TModel model, CancellationToken cancellationToken = default)
{ {
// check if the model is being exporting already // check if the model is being exporting already
if (!exporting_models.Contains(model)) if (!exporting_models.Contains(model))
@ -93,7 +93,8 @@ namespace osu.Game.Database
{ {
using (var stream = exportStorage.CreateFileSafely(filename)) using (var stream = exportStorage.CreateFileSafely(filename))
{ {
success = await ExportToStreamAsync(model, stream, notification, cancellationToken ?? notification.CancellationToken).ConfigureAwait(false); success = await ExportToStreamAsync(model, stream, notification,
cancellationToken == CancellationToken.None ? notification.CancellationToken : cancellationToken).ConfigureAwait(false);
} }
} }
catch (OperationCanceledException) catch (OperationCanceledException)