From 1519084f72bd34d3af83cfbcccf728225a79b791 Mon Sep 17 00:00:00 2001 From: Dan Balasescu Date: Tue, 2 Sep 2025 17:57:15 +0900 Subject: [PATCH] Eagerly clear the request queue on join --- osu.Game/Online/Multiplayer/MultiplayerClient.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs index 1dfa3c0cfb..745e773512 100644 --- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs +++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs @@ -202,6 +202,7 @@ namespace osu.Game.Online.Multiplayer await joinOrLeaveTaskChain.Add(async () => { + await runOnUpdateThreadAsync(() => pendingRequests.Clear(), cancellationSource.Token).ConfigureAwait(false); var multiplayerRoom = await CreateRoomInternal(new MultiplayerRoom(room)).ConfigureAwait(false); await setupJoinedRoom(room, multiplayerRoom, cancellationSource.Token).ConfigureAwait(false); }, cancellationSource.Token).ConfigureAwait(false); @@ -225,6 +226,7 @@ namespace osu.Game.Online.Multiplayer await joinOrLeaveTaskChain.Add(async () => { + await runOnUpdateThreadAsync(() => pendingRequests.Clear(), cancellationSource.Token).ConfigureAwait(false); var multiplayerRoom = await JoinRoomInternal(room.RoomID.Value, password ?? room.Password).ConfigureAwait(false); await setupJoinedRoom(room, multiplayerRoom, cancellationSource.Token).ConfigureAwait(false); }, cancellationSource.Token).ConfigureAwait(false);