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.

Sign up for GitHub

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 error message on invalid room password #32299

Merged
merged 1 commit into from
Mar 9, 2025
Merged

Fix error message on invalid room password #32299

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions osu.Game/Online/Multiplayer/InvalidPasswordException.cs
View file
Original file line number Diff line number Diff line change
@@ -9,5 +9,9 @@ namespace osu.Game.Online.Multiplayer
[Serializable]
public class InvalidPasswordException : HubException
{
public InvalidPasswordException()
: base("Invalid password")
{
}
}
}
17 changes: 11 additions & 6 deletions osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerLoungeSubScreen.cs
View file
Original file line number Diff line number Diff line change
@@ -84,12 +84,17 @@ protected override void JoinInternal(Room room, string? password, Action<Room> o
onSuccess(room);
else
{
const string message = "Failed to join multiplayer room.";

if (result.Exception != null)
Logger.Error(result.Exception, message);

onFailure.Invoke(result.Exception?.AsSingular().Message ?? message);
Exception? exception = result.Exception?.AsSingular();

if (exception?.GetHubExceptionMessage() is string message)
onFailure(message);
else
{
const string generic_failure_message = "Failed to join multiplayer room.";
if (result.Exception != null)
Logger.Error(result.Exception, generic_failure_message);
onFailure(generic_failure_message);
}
}
});
}