sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-03 01:09:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into user-beatmap-downloading-states-2

Browse Source
This commit is contained in:
Dan Balasescu
2021-02-09 21:06:09 +09:00
committed by GitHub
parent 04c243386b 15b3747945
commit 92599aa02b
38 changed files with 787 additions and 593 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
osu.Game/Online/Multiplayer/MultiplayerClient.cs
View File

@ -126,20 +126,12 @@ namespace osu.Game.Online.Multiplayer
return connection.InvokeAsync<MultiplayerRoom>(nameof(IMultiplayerServer.JoinRoom), roomId);
}
public override async Task LeaveRoom()
protected override Task LeaveRoomInternal()
{
if (!isConnected.Value)
{
// even if not connected, make sure the local room state can be cleaned up.
await base.LeaveRoom();
return;
}
return Task.FromCanceled(new CancellationToken(true));
if (Room == null)
return;
await base.LeaveRoom();
await connection.InvokeAsync(nameof(IMultiplayerServer.LeaveRoom));
return connection.InvokeAsync(nameof(IMultiplayerServer.LeaveRoom));
}
public override Task TransferHost(int userId)