From 06c99e8c7c259e8ffb712ff5320163b38e0f4aa3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 20 May 2021 19:45:11 +0900
Subject: [PATCH] Fix race due to StopWatchingUser() being called
 asynchronously

---
 osu.Game/Online/Spectator/SpectatorClient.cs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Online/Spectator/SpectatorClient.cs b/osu.Game/Online/Spectator/SpectatorClient.cs
index f930328846..de5e57a1d0 100644
--- a/osu.Game/Online/Spectator/SpectatorClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorClient.cs
@@ -182,9 +182,13 @@ namespace osu.Game.Online.Spectator
 
         public void StopWatchingUser(int userId)
         {
-            watchingUsers.Remove(userId);
-
-            StopWatchingUserInternal(userId);
+            // This method is most commonly called via Dispose(), which is asynchronous.
+            // Todo: This should not be a thing, but requires framework changes.
+            Schedule(() =>
+            {
+                watchingUsers.Remove(userId);
+                StopWatchingUserInternal(userId);
+            });
         }
 
         protected abstract Task BeginPlayingInternal(SpectatorState state);