1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 06:57:39 +08:00

Merge branch 'master' into patch-1

This commit is contained in:
Paul Teng 2018-09-20 23:45:44 -04:00 committed by GitHub
commit f01dfc2860
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

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();
}
@ -441,6 +442,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);
}