Purge final spectator frames before ending play

osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs

@@ -15,11 +15,14 @@ using osu.Game.Online.Spectator;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Replays;
 using osu.Game.Rulesets.UI;
+using osu.Game.Scoring;
 using osu.Game.Screens;
 using osu.Game.Screens.Play;
+using osu.Game.Tests.Beatmaps;
 using osu.Game.Tests.Beatmaps.IO;
 using osu.Game.Tests.Visual.Multiplayer;
 using osu.Game.Tests.Visual.Spectator;
+using osuTK;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
@@ -200,6 +203,21 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("screen didn't change", () => Stack.CurrentScreen is SoloSpectator);
         }
 
+        [Test]
+        public void TestFinalFramesPurgedBeforeEndingPlay()
+        {
+            AddStep("begin playing", () => spectatorClient.BeginPlaying(new GameplayState(new TestBeatmap(new OsuRuleset().RulesetInfo), new OsuRuleset()), new Score()));
+
+            AddStep("send frames and finish play", () =>
+            {
+                spectatorClient.HandleFrame(new OsuReplayFrame(1000, Vector2.Zero));
+                spectatorClient.EndPlaying();
+            });
+
+            // We can't access API because we're an "online" test.
+            AddAssert("last received frame has time = 1000", () => spectatorClient.LastReceivedFrame.First().Value.Time == 1000);
+        }
+
         private OsuFramedReplayInputHandler replayHandler =>
             (OsuFramedReplayInputHandler)Stack.ChildrenOfType<OsuInputManager>().First().ReplayInputHandler;
 

osu.Game/Online/Spectator/SpectatorClient.cs

@@ -167,6 +167,9 @@ namespace osu.Game.Online.Spectator
                 if (!IsPlaying)
                     return;
 
+                if (pendingFrames.Count > 0)
+                    purgePendingFrames(true);
+
                 IsPlaying = false;
                 currentBeatmap = null;
 
@@ -238,9 +241,12 @@ namespace osu.Game.Online.Spectator
                 purgePendingFrames();
         }
 
-        private void purgePendingFrames()
+        private void purgePendingFrames(bool force = false)
         {
-            if (lastSend?.IsCompleted == false)
+            if (lastSend?.IsCompleted == false && !force)
+                return;
+
+            if (pendingFrames.Count == 0)
                 return;
 
             var frames = pendingFrames.ToArray();

osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs

@@ -14,6 +14,7 @@ using osu.Framework.Utils;
 using osu.Game.Online.API;
 using osu.Game.Online.Spectator;
 using osu.Game.Replays.Legacy;
+using osu.Game.Rulesets.Replays;
 using osu.Game.Scoring;
 
 namespace osu.Game.Tests.Visual.Spectator
@@ -27,12 +28,22 @@ namespace osu.Game.Tests.Visual.Spectator
 
         public override IBindable<bool> IsConnected { get; } = new Bindable<bool>(true);
 
+        public readonly Dictionary<int, ReplayFrame> LastReceivedFrame = new Dictionary<int, ReplayFrame>();
         private readonly Dictionary<int, int> userBeatmapDictionary = new Dictionary<int, int>();
         private readonly Dictionary<int, int> userNextFrameDictionary = new Dictionary<int, int>();
 
         [Resolved]
         private IAPIProvider api { get; set; } = null!;
 
+        public TestSpectatorClient()
+        {
+            OnNewFrames += (i, bundle) =>
+            {
+                if (PlayingUsers.Contains(i))
+                    LastReceivedFrame[i] = bundle.Frames[^1];
+            };
+        }
+
         /// <summary>
         /// Starts play for an arbitrary user.
         /// </summary>