From 4457648b1cc45d0752b26730edff24e4b1829d02 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Nov 2022 17:42:33 +0900
Subject: [PATCH] Fix editor playing too many sounds when user performs a
 manual seek during playback

---
 osu.Game/Screens/Edit/Editor.cs | 48 +++++++++++++++------------------
 1 file changed, 22 insertions(+), 26 deletions(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index df3c1f7ec4..d7406e6289 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -234,7 +234,7 @@ namespace osu.Game.Screens.Edit
             AddInternal(editorBeatmap = new EditorBeatmap(playableBeatmap, loadableBeatmap.GetSkin(), loadableBeatmap.BeatmapInfo));
             dependencies.CacheAs(editorBeatmap);
 
-            editorBeatmap.UpdateInProgress.BindValueChanged(updateInProgress);
+            editorBeatmap.UpdateInProgress.BindValueChanged(_ => updateSampleDisabledState());
 
             canSave = editorBeatmap.BeatmapInfo.Ruleset.CreateInstance() is ILegacyRuleset;
 
@@ -659,7 +659,7 @@ namespace osu.Game.Screens.Edit
 
                 if (isNewBeatmap || HasUnsavedChanges)
                 {
-                    samplePlaybackDisabled.Value = true;
+                    updateSampleDisabledState();
                     dialogOverlay?.Push(new PromptForSaveDialog(confirmExit, confirmExitWithSave, cancelExit));
                     return true;
                 }
@@ -729,27 +729,6 @@ namespace osu.Game.Screens.Edit
             this.Exit();
         }
 
-        #region Mute from update application
-
-        private ScheduledDelegate temporaryMuteRestorationDelegate;
-        private bool temporaryMuteFromUpdateInProgress;
-
-        private void updateInProgress(ValueChangedEvent<bool> obj)
-        {
-            temporaryMuteFromUpdateInProgress = true;
-            updateSampleDisabledState();
-
-            // Debounce is arbitrarily high enough to avoid flip-flopping the value each other frame.
-            temporaryMuteRestorationDelegate?.Cancel();
-            temporaryMuteRestorationDelegate = Scheduler.AddDelayed(() =>
-            {
-                temporaryMuteFromUpdateInProgress = false;
-                updateSampleDisabledState();
-            }, 50);
-        }
-
-        #endregion
-
         #region Clipboard support
 
         private EditorMenuItem cutMenuItem;
@@ -883,11 +862,28 @@ namespace osu.Game.Screens.Edit
             }
         }
 
+        [CanBeNull]
+        private ScheduledDelegate playbackDisabledDebounce;
+
         private void updateSampleDisabledState()
         {
-            samplePlaybackDisabled.Value = clock.SeekingOrStopped.Value
-                                           || currentScreen is not ComposeScreen
-                                           || temporaryMuteFromUpdateInProgress;
+            bool shouldDisableSamples = clock.SeekingOrStopped.Value
+                                        || currentScreen is not ComposeScreen
+                                        || editorBeatmap.UpdateInProgress.Value
+                                        || dialogOverlay?.CurrentDialog != null;
+
+            playbackDisabledDebounce?.Cancel();
+
+            if (shouldDisableSamples)
+            {
+                samplePlaybackDisabled.Value = true;
+            }
+            else
+            {
+                // Debounce re-enabling arbitrarily high enough to avoid flip-flopping during beatmap updates
+                // or rapid user seeks.
+                playbackDisabledDebounce = Scheduler.AddDelayed(() => samplePlaybackDisabled.Value = false, 50);
+            }
         }
 
         private void seek(UIEvent e, int direction)