From 9e6b0148a0dbe42f93ce353c644a458eece858a0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 11 May 2026 03:27:34 +0900
Subject: [PATCH] Ensure samples definitely stop playing when exiting queue
 screen

See https://github.com/ppy/osu/issues/37379.
---
 osu.Game/Screens/OnlinePlay/Matchmaking/Queue/ScreenQueue.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Matchmaking/Queue/ScreenQueue.cs b/osu.Game/Screens/OnlinePlay/Matchmaking/Queue/ScreenQueue.cs
index 9b325cd080..3da4013c61 100644
--- a/osu.Game/Screens/OnlinePlay/Matchmaking/Queue/ScreenQueue.cs
+++ b/osu.Game/Screens/OnlinePlay/Matchmaking/Queue/ScreenQueue.cs
@@ -465,6 +465,7 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.Queue
         {
             base.OnSuspending(e);
 
+            stopWaitingLoopPlayback();
             client.MatchmakingLeaveLobby().FireAndForget();
         }
 
@@ -473,6 +474,8 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.Queue
             if (base.OnExiting(e))
                 return true;
 
+            stopWaitingLoopPlayback();
+
             switch (currentState.Value)
             {
                 default: