From 6c671434ec9670443fbd1a118ec95a218da955b5 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 9 Aug 2022 14:41:36 +0900
Subject: [PATCH] Fix gameplay tests crashing when run multiple times

---
 osu.Game/Screens/Play/SubmittingPlayer.cs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index 02a95ae9eb..2e9e01ab8d 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.cs
@@ -203,5 +203,15 @@ namespace osu.Game.Screens.Play
             api.Queue(request);
             return scoreSubmissionSource.Task;
         }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            // Specific to tests, the player can be disposed without OnExiting() ever being called.
+            // We should make sure that the gameplay session has finished even in this case.
+            if (LoadedBeatmapSuccessfully)
+                spectatorClient.EndPlaying(GameplayState);
+        }
     }
 }