From 00d50150de6e39cbdff44e7f5a98c41a3c57b6a6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Dec 2020 15:49:22 +0900
Subject: [PATCH] Ensure the current room is left at a mutliplayer client level
 on client disconnection

---
 .../RealtimeMultiplayer/RealtimeMultiplayerClient.cs   |  4 ++++
 .../RealtimeMultiplayer/StatefulMultiplayerClient.cs   | 10 ++++++++++
 2 files changed, 14 insertions(+)

diff --git a/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs
index 75bb578a29..5cbf3be8ca 100644
--- a/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs
@@ -130,7 +130,11 @@ namespace osu.Game.Online.RealtimeMultiplayer
         public override async Task LeaveRoom()
         {
             if (!isConnected.Value)
+            {
+                // even if not connected, make sure the local room state can be cleaned up.
+                await base.LeaveRoom();
                 return;
+            }
 
             if (Room == null)
                 return;
diff --git a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
index 4ebd648689..9680387fcc 100644
--- a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
@@ -75,6 +75,16 @@ namespace osu.Game.Online.RealtimeMultiplayer
         // Todo: This is temporary, until the multiplayer server returns the item id on match start or otherwise.
         private int playlistItemId;
 
+        protected StatefulMultiplayerClient()
+        {
+            IsConnected.BindValueChanged(connected =>
+            {
+                // clean up local room state on server disconnect.
+                if (!connected.NewValue)
+                    LeaveRoom();
+            });
+        }
+
         /// <summary>
         /// Joins the <see cref="MultiplayerRoom"/> for a given API <see cref="Room"/>.
         /// </summary>