Skip to content

Commit 3e7005d

Browse files
authored
Merge pull request #30956 from peppy/named-pipe
Fix osu! sometimes not starting when WSL is running in the background
2 parents 5849a69 + b9f1fef commit 3e7005d

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
lines changed

osu.Android.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
1111
</PropertyGroup>
1212
<ItemGroup>
13-
<PackageReference Include="ppy.osu.Framework.Android" Version="2024.1205.0" />
13+
<PackageReference Include="ppy.osu.Framework.Android" Version="2024.1206.0" />
1414
</ItemGroup>
1515
<PropertyGroup>
1616
<!-- Fody does not handle Android build well, and warns when unchanged.

osu.Desktop/Program.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public static void Main(string[] args)
9999

100100
var hostOptions = new HostOptions
101101
{
102-
IPCPort = !tournamentClient ? OsuGame.IPC_PORT : null,
102+
IPCPipeName = !tournamentClient ? OsuGame.IPC_PIPE_NAME : null,
103103
FriendlyGameName = OsuGameBase.GAME_NAME,
104104
};
105105

osu.Game.Tests/Visual/Navigation/TestSceneInterProcessCommunication.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public override void SetUpSteps()
6363
});
6464
AddStep("create IPC sender channels", () =>
6565
{
66-
ipcSenderHost = new HeadlessGameHost(gameHost.Name, new HostOptions { IPCPort = OsuGame.IPC_PORT });
66+
ipcSenderHost = new HeadlessGameHost(gameHost.Name, new HostOptions { IPCPipeName = OsuGame.IPC_PIPE_NAME });
6767
osuSchemeLinkIPCSender = new OsuSchemeLinkIPCChannel(ipcSenderHost);
6868
archiveImportIPCSender = new ArchiveImportIPCChannel(ipcSenderHost);
6969
});

osu.Game/OsuGame.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ public partial class OsuGame : OsuGameBase, IKeyBindingHandler<GlobalAction>, IL
8787
{
8888
#if DEBUG
8989
// Different port allows running release and debug builds alongside each other.
90-
public const int IPC_PORT = 44824;
90+
public const string IPC_PIPE_NAME = "osu-lazer-debug";
9191
#else
92-
public const int IPC_PORT = 44823;
92+
public const string IPC_PORT = "osu-lazer";
9393
#endif
9494

9595
/// <summary>

osu.Game/Tests/CleanRunHeadlessGameHost.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public CleanRunHeadlessGameHost(bool bindIPC = false, bool realtime = true, bool
2727
[CallerMemberName] string callingMethodName = @"")
2828
: base($"{callingMethodName}-{Guid.NewGuid()}", new HostOptions
2929
{
30-
IPCPort = bindIPC ? OsuGame.IPC_PORT : null,
30+
IPCPipeName = bindIPC ? OsuGame.IPC_PIPE_NAME : null,
3131
}, bypassCleanup: bypassCleanupOnDispose, realtime: realtime)
3232
{
3333
this.bypassCleanupOnSetup = bypassCleanupOnSetup;

osu.Game/osu.Game.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3636
</PackageReference>
3737
<PackageReference Include="Realm" Version="11.5.0" />
38-
<PackageReference Include="ppy.osu.Framework" Version="2024.1205.0" />
38+
<PackageReference Include="ppy.osu.Framework" Version="2024.1206.0" />
3939
<PackageReference Include="ppy.osu.Game.Resources" Version="2024.1202.0" />
4040
<PackageReference Include="Sentry" Version="4.13.0" />
4141
<!-- Held back due to 0.34.0 failing AOT compilation on ZstdSharp.dll dependency. -->

osu.iOS.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
<MtouchInterpreter>-all</MtouchInterpreter>
1818
</PropertyGroup>
1919
<ItemGroup>
20-
<PackageReference Include="ppy.osu.Framework.iOS" Version="2024.1205.0" />
20+
<PackageReference Include="ppy.osu.Framework.iOS" Version="2024.1206.0" />
2121
</ItemGroup>
2222
</Project>

0 commit comments

Comments
 (0)