sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-08 09:03:50 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
parent 6019839d66 754c56d7ae
commit 5edc5c2adc
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Desktop/Program.cs
View File

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

6
osu.Game/OsuGame.cs
View File

@ -210,12 +210,6 @@ namespace osu.Game
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load() 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) if (args?.Length > 0)
{ {
var paths = args.Where(a => !a.StartsWith('-')).ToArray(); var paths = args.Where(a => !a.StartsWith('-')).ToArray();