h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 16:52:54 +08:00
Code Issues Releases Wiki Activity

Prevent some data races

Browse Source
This commit is contained in:
smoogipoo 2021-01-25 20:58:02 +09:00
parent 964976f604
commit bb44fcfe31
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
View File

@ -6,6 +6,7 @@
using System;
using System.Diagnostics;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
@ -148,12 +149,15 @@ namespace osu.Game.Online.Multiplayer
/// <returns>The joined <see cref="MultiplayerRoom"/>.</returns>
protected abstract Task<MultiplayerRoom> JoinRoom(long roomId);
public async Task LeaveRoom() => await joinOrLeaveTaskChain.Add(async () =>
public Task LeaveRoom()
{
if (Room == null)
return;
return Task.FromCanceled(new CancellationToken(true));
await scheduleAsync(() =>
// Leaving rooms is expected to occur instantaneously whilst the operation is finalised in the background.
// However a few members need to be reset immediately to prevent other components from entering invalid states whilst the operation hasn't yet completed.
// For example, if a room was left and the user immediately pressed the "create room" button, then the user could be taken into the lobby if the value of Room is not reset in time.
var scheduledReset = scheduleAsync(() =>
{
apiRoom = null;
Room = null;
@ -162,8 +166,12 @@ namespace osu.Game.Online.Multiplayer
RoomUpdated?.Invoke();
});
await LeaveRoomInternal();
});
return joinOrLeaveTaskChain.Add(async () =>
{
await scheduledReset;
await LeaveRoomInternal();
});
}
protected abstract Task LeaveRoomInternal();