h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-05-22 02:49:56 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into spin-in

Browse Source
This commit is contained in:
Kyle Chang
2018-09-21 00:11:23 -04:00
committed by GitHub
Unverified
parent 3cb33e53cc 7a58343201
commit e56f4307ee
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game/Database/ArchiveModelManager.cs
+9 -1
View File
@@ -96,7 +96,8 @@ namespace osu.Game.Database
private void handleEvent(Action a)
{
if (delayingEvents)
lock (queuedEvents) queuedEvents.Add(a);
lock (queuedEvents)
queuedEvents.Add(a);
else
a.Invoke();
}
@@ -438,6 +439,13 @@ namespace osu.Game.Database
return Task.CompletedTask;
}
if (!stable.ExistsDirectory(ImportFromStablePath))
{
// This handles situations like when the user does not have a Skins folder
Logger.Log($"No {ImportFromStablePath} folder available in osu!stable installation", LoggingTarget.Information, LogLevel.Error);
return Task.CompletedTask;
}
return Task.Factory.StartNew(() => Import(stable.GetDirectories(ImportFromStablePath).Select(f => stable.GetFullPath(f)).ToArray()), TaskCreationOptions.LongRunning);
}