mirror of
https://github.com/ppy/osu.git
synced 2024-12-05 03:13:22 +08:00
Merge 75781e3436
into f09d8f097a
This commit is contained in:
commit
84f4a37ae2
@ -99,7 +99,7 @@ namespace osu.Desktop
|
|||||||
|
|
||||||
var hostOptions = new HostOptions
|
var hostOptions = new HostOptions
|
||||||
{
|
{
|
||||||
IPCPort = !tournamentClient ? OsuGame.IPC_PORT : null,
|
IPCPipeName = !tournamentClient ? OsuGame.IPC_PIPE_NAME : null,
|
||||||
FriendlyGameName = OsuGameBase.GAME_NAME,
|
FriendlyGameName = OsuGameBase.GAME_NAME,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -63,7 +63,7 @@ namespace osu.Game.Tests.Visual.Navigation
|
|||||||
});
|
});
|
||||||
AddStep("create IPC sender channels", () =>
|
AddStep("create IPC sender channels", () =>
|
||||||
{
|
{
|
||||||
ipcSenderHost = new HeadlessGameHost(gameHost.Name, new HostOptions { IPCPort = OsuGame.IPC_PORT });
|
ipcSenderHost = new HeadlessGameHost(gameHost.Name, new HostOptions { IPCPipeName = OsuGame.IPC_PIPE_NAME });
|
||||||
osuSchemeLinkIPCSender = new OsuSchemeLinkIPCChannel(ipcSenderHost);
|
osuSchemeLinkIPCSender = new OsuSchemeLinkIPCChannel(ipcSenderHost);
|
||||||
archiveImportIPCSender = new ArchiveImportIPCChannel(ipcSenderHost);
|
archiveImportIPCSender = new ArchiveImportIPCChannel(ipcSenderHost);
|
||||||
});
|
});
|
||||||
|
@ -87,9 +87,9 @@ namespace osu.Game
|
|||||||
{
|
{
|
||||||
#if DEBUG
|
#if DEBUG
|
||||||
// Different port allows running release and debug builds alongside each other.
|
// Different port allows running release and debug builds alongside each other.
|
||||||
public const int IPC_PORT = 44824;
|
public const string IPC_PIPE_NAME = "osu-lazer-debug";
|
||||||
#else
|
#else
|
||||||
public const int IPC_PORT = 44823;
|
public const string IPC_PORT = "osu-lazer";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@ -27,7 +27,7 @@ namespace osu.Game.Tests
|
|||||||
[CallerMemberName] string callingMethodName = @"")
|
[CallerMemberName] string callingMethodName = @"")
|
||||||
: base($"{callingMethodName}-{Guid.NewGuid()}", new HostOptions
|
: base($"{callingMethodName}-{Guid.NewGuid()}", new HostOptions
|
||||||
{
|
{
|
||||||
IPCPort = bindIPC ? OsuGame.IPC_PORT : null,
|
IPCPipeName = bindIPC ? OsuGame.IPC_PIPE_NAME : null,
|
||||||
}, bypassCleanup: bypassCleanupOnDispose, realtime: realtime)
|
}, bypassCleanup: bypassCleanupOnDispose, realtime: realtime)
|
||||||
{
|
{
|
||||||
this.bypassCleanupOnSetup = bypassCleanupOnSetup;
|
this.bypassCleanupOnSetup = bypassCleanupOnSetup;
|
||||||
|
Loading…
Reference in New Issue
Block a user