sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-30 01:47:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

Remove async from Import method

Browse Source
This commit is contained in:
HoLLy 2019-06-21 17:01:11 +02:00
parent 99f1a94797
commit f1f03dd541
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -246,7 +246,7 @@ namespace osu.Game.Database
/// </summary> /// </summary>
/// <param name="archive">The archive to be imported.</param> /// <param name="archive">The archive to be imported.</param>
/// <param name="cancellationToken">An optional cancellation token.</param> /// <param name="cancellationToken">An optional cancellation token.</param>
public async Task<TModel> Import(ArchiveReader archive, CancellationToken cancellationToken = default) public Task<TModel> Import(ArchiveReader archive, CancellationToken cancellationToken = default)
{ {
cancellationToken.ThrowIfCancellationRequested(); cancellationToken.ThrowIfCancellationRequested();
@ -256,7 +256,7 @@ namespace osu.Game.Database
{ {
model = CreateModel(archive); model = CreateModel(archive);
if (model == null) return null; if (model == null) return Task.FromResult<TModel>(null);
model.Hash = computeHash(archive); model.Hash = computeHash(archive);
} }
@ -270,7 +270,7 @@ namespace osu.Game.Database
return null; return null;
} }
return await Import(model, archive, cancellationToken); return Import(model, archive, cancellationToken);
} }
/// <summary> /// <summary>