From 895eb14c5ae222877b49cd322409f0ce3736f927 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 21 May 2021 14:09:30 +0900
Subject: [PATCH] Forcefully end playing to fix test failures

---
 osu.Game/Online/Spectator/SpectatorClient.cs | 3 +++
 osu.Game/Screens/Play/Player.cs              | 9 +++++++++
 2 files changed, 12 insertions(+)

diff --git a/osu.Game/Online/Spectator/SpectatorClient.cs b/osu.Game/Online/Spectator/SpectatorClient.cs
index cb98b01bed..3a29e73b8f 100644
--- a/osu.Game/Online/Spectator/SpectatorClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorClient.cs
@@ -174,6 +174,9 @@ namespace osu.Game.Online.Spectator
 
         public void EndPlaying()
         {
+            if (!IsPlaying)
+                return;
+
             IsPlaying = false;
             currentBeatmap = null;
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 6317a41bec..39f9e2d388 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -22,6 +22,7 @@ using osu.Game.Configuration;
 using osu.Game.Graphics.Containers;
 using osu.Game.IO.Archives;
 using osu.Game.Online.API;
+using osu.Game.Online.Spectator;
 using osu.Game.Overlays;
 using osu.Game.Replays;
 using osu.Game.Rulesets;
@@ -93,6 +94,9 @@ namespace osu.Game.Screens.Play
         [Resolved]
         private MusicController musicController { get; set; }
 
+        [Resolved]
+        private SpectatorClient spectatorClient { get; set; }
+
         private Sample sampleRestart;
 
         public BreakOverlay BreakOverlay;
@@ -882,6 +886,11 @@ namespace osu.Game.Screens.Play
                 return true;
             }
 
+            // EndPlaying() is typically called from ReplayRecorder.Dispose(). Disposal is currently asynchronous.
+            // To resolve test failures, forcefully end playing synchronously when this screen exits.
+            // Todo: Replace this with a more permanent solution once osu-framework has a synchronous cleanup method.
+            spectatorClient.EndPlaying();
+
             // GameplayClockContainer performs seeks / start / stop operations on the beatmap's track.
             // as we are no longer the current screen, we cannot guarantee the track is still usable.
             (GameplayClockContainer as MasterGameplayClockContainer)?.StopUsingBeatmapClock();