From 7f712a4d04b64b4f9801208048f30f2a272b0a4e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 21 May 2021 15:57:39 +0900
Subject: [PATCH] Fix EndPlaying potentially doing cross-thread mutation

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

diff --git a/osu.Game/Online/Spectator/SpectatorClient.cs b/osu.Game/Online/Spectator/SpectatorClient.cs
index b90fec09d6..48e2528528 100644
--- a/osu.Game/Online/Spectator/SpectatorClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorClient.cs
@@ -167,10 +167,15 @@ public void BeginPlaying(GameplayBeatmap beatmap, Score score)
 
         public void EndPlaying()
         {
-            IsPlaying = false;
-            currentBeatmap = null;
+            // This method is most commonly called via Dispose(), which is asynchronous.
+            // Todo: This should not be a thing, but requires framework changes.
+            Schedule(() =>
+            {
+                IsPlaying = false;
+                currentBeatmap = null;
 
-            EndPlayingInternal(currentState);
+                EndPlayingInternal(currentState);
+            });
         }
 
         public void WatchUser(int userId)