h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-16 13:02:55 +08:00
Code Issues Releases Wiki Activity

Fix stuck lounge on join failure

Browse Source
This commit is contained in:
smoogipoo 2020-12-22 15:27:49 +09:00
parent 85e93c5dde
commit ab90db7c8d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
View File

@ -38,10 +38,10 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
} }
public override void CreateRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null) public override void CreateRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
=> base.CreateRoom(room, r => joinMultiplayerRoom(r, onSuccess), onError); => base.CreateRoom(room, r => joinMultiplayerRoom(r, onSuccess, onError), onError);
public override void JoinRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null) public override void JoinRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
=> base.JoinRoom(room, r => joinMultiplayerRoom(r, onSuccess), onError); => base.JoinRoom(room, r => joinMultiplayerRoom(r, onSuccess, onError), onError);
public override void PartRoom() public override void PartRoom()
{ {
@ -62,7 +62,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
}); });
} }
private void joinMultiplayerRoom(Room room, Action<Room> onSuccess = null) private void joinMultiplayerRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
{ {
Debug.Assert(room.RoomID.Value != null); Debug.Assert(room.RoomID.Value != null);
@ -73,6 +73,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
PartRoom(); PartRoom();
if (t.Exception != null) if (t.Exception != null)
Logger.Error(t.Exception, "Failed to join multiplayer room."); Logger.Error(t.Exception, "Failed to join multiplayer room.");
onError?.Invoke(t.Exception?.ToString() ?? string.Empty);
}, TaskContinuationOptions.NotOnRanToCompletion); }, TaskContinuationOptions.NotOnRanToCompletion);
} }