h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-10 03:57:20 +08:00
Code Issues Releases Wiki Activity

Merge pull request #32299 from smoogipoo/fix-invalid-password-message

Browse Source 
Fix error message on invalid room password
This commit is contained in:
Dean Herbert 2025-03-09 19:35:07 +09:00 committed by GitHub
commit 2c690b1139
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Online/Multiplayer/InvalidPasswordException.cs
View File

@ -9,5 +9,9 @@ namespace osu.Game.Online.Multiplayer
[Serializable]
public class InvalidPasswordException : HubException
{
public InvalidPasswordException()
: base("Invalid password")
{
}
}
}

15
osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerLoungeSubScreen.cs
View File

@ -84,12 +84,17 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
onSuccess(room);
else
{
const string message = "Failed to join multiplayer room.";
Exception? exception = result.Exception?.AsSingular();
if (result.Exception != null)
Logger.Error(result.Exception, message);
onFailure.Invoke(result.Exception?.AsSingular().Message ?? message);
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);
}
}
});
}