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

Merge pull request #13757 from peppy/fix-import-optimisation

Browse Source 
Fix incorrect `base` call causing import optimisation to not work
This commit is contained in:
Dan Balasescu 2021-07-05 10:26:52 +09:00 committed by GitHub
commit b6542a835b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Beatmaps/BeatmapManager.cs
View File

@ -324,7 +324,7 @@ namespace osu.Game.Beatmaps
protected override bool CanSkipImport(BeatmapSetInfo existing, BeatmapSetInfo import) protected override bool CanSkipImport(BeatmapSetInfo existing, BeatmapSetInfo import)
{ {
if (!base.CanReuseExisting(existing, import)) if (!base.CanSkipImport(existing, import))
return false; return false;
return existing.Beatmaps.Any(b => b.OnlineBeatmapID != null); return existing.Beatmaps.Any(b => b.OnlineBeatmapID != null);

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

@ -353,8 +353,6 @@ namespace osu.Game.Database
{ {
cancellationToken.ThrowIfCancellationRequested(); cancellationToken.ThrowIfCancellationRequested();
delayEvents();
bool checkedExisting = false; bool checkedExisting = false;
TModel existing = null; TModel existing = null;
@ -394,6 +392,8 @@ namespace osu.Game.Database
} }
} }
delayEvents();
try try
{ {
LogForModel(item, @"Beginning import..."); LogForModel(item, @"Beginning import...");