RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-03-20 18:08:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move disconnect logic inside connection loop to ensure previous connection is disposed

Browse Source
This commit is contained in:
Dean Herbert 2021-01-26 18:59:42 +09:00
parent 0f09a7feb9
commit b573c96c07
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,14 +71,15 @@ namespace osu.Game.Online.Multiplayer
try try
{ {
await disconnect(false);
// this token will be valid for the scope of this connection. // this token will be valid for the scope of this connection.
// if cancelled, we can be sure that a disconnect or reconnect is handled elsewhere. // if cancelled, we can be sure that a disconnect or reconnect is handled elsewhere.
var cancellationToken = connectCancelSource.Token; var cancellationToken = connectCancelSource.Token;
while (api.State.Value == APIState.Online) while (api.State.Value == APIState.Online)
{ {
// ensure any previous connection was disposed.
await disconnect(false);
cancellationToken.ThrowIfCancellationRequested(); cancellationToken.ThrowIfCancellationRequested();
Logger.Log("Multiplayer client connecting...", LoggingTarget.Network); Logger.Log("Multiplayer client connecting...", LoggingTarget.Network);