1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 13:22:55 +08:00

Merge pull request #14826 from peppy/move-startup-concurrency-check

Move startup concurrency check to higher level
This commit is contained in:
Dan Balasescu 2021-09-29 18:28:15 +09:00 committed by GitHub
commit 5edc5c2adc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 6 deletions

View File

@ -74,8 +74,11 @@ namespace osu.Desktop
// we want to allow multiple instances to be started when in debug.
if (!DebugUtils.IsDebugBuild)
{
Logger.Log(@"osu! does not support multiple running instances.", LoggingTarget.Runtime, LogLevel.Error);
return 0;
}
}
if (tournamentClient)
host.Run(new TournamentGame());

View File

@ -210,12 +210,6 @@ namespace osu.Game
[BackgroundDependencyLoader]
private void load()
{
if (!Host.IsPrimaryInstance && !DebugUtils.IsDebugBuild)
{
Logger.Log(@"osu! does not support multiple running instances.", LoggingTarget.Runtime, LogLevel.Error);
Environment.Exit(0);
}
if (args?.Length > 0)
{
var paths = args.Where(a => !a.StartsWith('-')).ToArray();