From d127494c2dedfd133012e574f7fe68d15049073d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 00:39:31 +0900
Subject: [PATCH 1/2] Fix thread-unsafe room removal

---
 .../Multi/RealtimeMultiplayer/RealtimeRoomManager.cs       | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
index a50628a5fa..734d00b9aa 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
@@ -54,9 +54,12 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             multiplayerClient.LeaveRoom().Wait();
 
             // Todo: This is not the way to do this. Basically when we're the only participant and the room closes, there's no way to know if this is actually the case.
-            RemoveRoom(joinedRoom);
             // This is delayed one frame because upon exiting the match subscreen, multiplayer updates the polling rate and messes with polling.
-            Schedule(() => listingPollingComponent.PollImmediately());
+            Schedule(() =>
+            {
+                RemoveRoom(joinedRoom);
+                listingPollingComponent.PollImmediately();
+            });
         }
 
         private void joinMultiplayerRoom(Room room, Action<Room> onSuccess = null)

From a893360c0e07d3c2b31206ace178ad33cf85a47f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 00:41:14 +0900
Subject: [PATCH 2/2] Reword comment

---
 .../Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
index 8d3b161804..0065b425ec 100644
--- a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
@@ -71,7 +71,9 @@ namespace osu.Game.Online.RealtimeMultiplayer
         private RulesetStore rulesets { get; set; } = null!;
 
         private Room? apiRoom;
-        private int playlistItemId; // Todo: THIS IS SUPER TEMPORARY!!
+
+        // Todo: This is temporary, until the multiplayer server returns the item id on match start or otherwise.
+        private int playlistItemId;
 
         /// <summary>
         /// Joins the <see cref="MultiplayerRoom"/> for a given API <see cref="Room"/>.