Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix osu! sometimes not starting when WSL is running in the background #30956

Merged
merged 3 commits into from
Dec 7, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion osu.Desktop/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public static void Main(string[] args)

var hostOptions = new HostOptions
{
IPCPort = !tournamentClient ? OsuGame.IPC_PORT : null,
IPCPipeName = !tournamentClient ? OsuGame.IPC_PIPE_NAME : null,
FriendlyGameName = OsuGameBase.GAME_NAME,
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public override void SetUpSteps()
});
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);
archiveImportIPCSender = new ArchiveImportIPCChannel(ipcSenderHost);
});
Expand Down
4 changes: 2 additions & 2 deletions osu.Game/OsuGame.cs
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,9 @@ public partial class OsuGame : OsuGameBase, IKeyBindingHandler<GlobalAction>, IL
{
#if DEBUG
// 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
public const int IPC_PORT = 44823;
public const string IPC_PORT = "osu-lazer";
#endif

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion osu.Game/Tests/CleanRunHeadlessGameHost.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
[CallerMemberName] string callingMethodName = @"")
: base($"{callingMethodName}-{Guid.NewGuid()}", new HostOptions
{
IPCPort = bindIPC ? OsuGame.IPC_PORT : null,
IPCPipeName = bindIPC ? OsuGame.IPC_PIPE_NAME : null,

Check failure on line 30 in osu.Game/Tests/CleanRunHeadlessGameHost.cs

View workflow job for this annotation

GitHub Actions / Build only (iOS)

'HostOptions' does not contain a definition for 'IPCPipeName'

Check failure on line 30 in osu.Game/Tests/CleanRunHeadlessGameHost.cs

View workflow job for this annotation

GitHub Actions / Build only (iOS)

'HostOptions' does not contain a definition for 'IPCPipeName'

Check failure on line 30 in osu.Game/Tests/CleanRunHeadlessGameHost.cs

View workflow job for this annotation

GitHub Actions / Build only (Android)

'HostOptions' does not contain a definition for 'IPCPipeName'

Check failure on line 30 in osu.Game/Tests/CleanRunHeadlessGameHost.cs

View workflow job for this annotation

GitHub Actions / Build only (Android)

'HostOptions' does not contain a definition for 'IPCPipeName'

Check failure on line 30 in osu.Game/Tests/CleanRunHeadlessGameHost.cs

View workflow job for this annotation

GitHub Actions / Code Quality

'HostOptions' does not contain a definition for 'IPCPipeName'

Check failure on line 30 in osu.Game/Tests/CleanRunHeadlessGameHost.cs

View workflow job for this annotation

GitHub Actions / Code Quality

'HostOptions' does not contain a definition for 'IPCPipeName'

Check failure on line 30 in osu.Game/Tests/CleanRunHeadlessGameHost.cs

View workflow job for this annotation

GitHub Actions / Test (Windows, windows-latest, SingleThread)

'HostOptions' does not contain a definition for 'IPCPipeName'

Check failure on line 30 in osu.Game/Tests/CleanRunHeadlessGameHost.cs

View workflow job for this annotation

GitHub Actions / Test (Windows, windows-latest, SingleThread)

'HostOptions' does not contain a definition for 'IPCPipeName'

Check failure on line 30 in osu.Game/Tests/CleanRunHeadlessGameHost.cs

View workflow job for this annotation

GitHub Actions / Test (Windows, windows-latest, MultiThreaded)

'HostOptions' does not contain a definition for 'IPCPipeName'

Check failure on line 30 in osu.Game/Tests/CleanRunHeadlessGameHost.cs

View workflow job for this annotation

GitHub Actions / Test (Windows, windows-latest, MultiThreaded)

'HostOptions' does not contain a definition for 'IPCPipeName'

Check failure on line 30 in osu.Game/Tests/CleanRunHeadlessGameHost.cs

View workflow job for this annotation

GitHub Actions / Test (Linux, ubuntu-latest, SingleThread)

'HostOptions' does not contain a definition for 'IPCPipeName'

Check failure on line 30 in osu.Game/Tests/CleanRunHeadlessGameHost.cs

View workflow job for this annotation

GitHub Actions / Test (Linux, ubuntu-latest, SingleThread)

'HostOptions' does not contain a definition for 'IPCPipeName'

Check failure on line 30 in osu.Game/Tests/CleanRunHeadlessGameHost.cs

View workflow job for this annotation

GitHub Actions / Test (Linux, ubuntu-latest, MultiThreaded)

'HostOptions' does not contain a definition for 'IPCPipeName'

Check failure on line 30 in osu.Game/Tests/CleanRunHeadlessGameHost.cs

View workflow job for this annotation

GitHub Actions / Test (Linux, ubuntu-latest, MultiThreaded)

'HostOptions' does not contain a definition for 'IPCPipeName'
}, bypassCleanup: bypassCleanupOnDispose, realtime: realtime)
{
this.bypassCleanupOnSetup = bypassCleanupOnSetup;
Expand Down
Loading