From a2fa55c4267f783459b855a58457ef77828a1eb8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Jun 2018 16:47:05 +0900
Subject: [PATCH 1/2] Fix dialog overlay playing double samples on show/hide

---
 .../Containers/OsuFocusedOverlayContainer.cs         | 12 ++++++++----
 osu.Game/Overlays/DialogOverlay.cs                   |  2 ++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs b/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
index 0528f7b3ae..e270b5efbe 100644
--- a/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
+++ b/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
@@ -17,6 +17,8 @@ namespace osu.Game.Graphics.Containers
         private SampleChannel samplePopIn;
         private SampleChannel samplePopOut;
 
+        protected virtual bool PlaySamplesOnStateChange => true;
+
         protected readonly Bindable<OverlayActivation> OverlayActivationMode = new Bindable<OverlayActivation>(OverlayActivation.All);
 
         [BackgroundDependencyLoader(true)]
@@ -28,7 +30,7 @@ namespace osu.Game.Graphics.Containers
             samplePopIn = audio.Sample.Get(@"UI/overlay-pop-in");
             samplePopOut = audio.Sample.Get(@"UI/overlay-pop-out");
 
-            StateChanged += onStateChanged;
+            StateChanged += OnStateChanged;
         }
 
         /// <summary>
@@ -51,18 +53,20 @@ namespace osu.Game.Graphics.Containers
             return base.OnClick(state);
         }
 
-        private void onStateChanged(Visibility visibility)
+        protected virtual void OnStateChanged(Visibility visibility)
         {
             switch (visibility)
             {
                 case Visibility.Visible:
                     if (OverlayActivationMode != OverlayActivation.Disabled)
-                        samplePopIn?.Play();
+                    {
+                        if (PlaySamplesOnStateChange) samplePopIn?.Play();
+                    }
                     else
                         State = Visibility.Hidden;
                     break;
                 case Visibility.Hidden:
-                    samplePopOut?.Play();
+                    if (PlaySamplesOnStateChange) samplePopOut?.Play();
                     break;
             }
         }
diff --git a/osu.Game/Overlays/DialogOverlay.cs b/osu.Game/Overlays/DialogOverlay.cs
index 7caab0dd6c..e26a3cba2f 100644
--- a/osu.Game/Overlays/DialogOverlay.cs
+++ b/osu.Game/Overlays/DialogOverlay.cs
@@ -30,6 +30,8 @@ namespace osu.Game.Overlays
             State = Visibility.Visible;
         }
 
+        protected override bool PlaySamplesOnStateChange => false;
+
         private void onDialogOnStateChanged(VisibilityContainer dialog, Visibility v)
         {
             if (v != Visibility.Hidden) return;

From 1e696d247e84d8f94d3122e55f67dffd6170b143 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 29 Jun 2018 18:33:28 +0900
Subject: [PATCH 2/2] Re-privatise

---
 osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs b/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
index 5f0190e7d7..323046f758 100644
--- a/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
+++ b/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Graphics.Containers
             samplePopIn = audio.Sample.Get(@"UI/overlay-pop-in");
             samplePopOut = audio.Sample.Get(@"UI/overlay-pop-out");
 
-            StateChanged += OnStateChanged;
+            StateChanged += onStateChanged;
         }
 
         /// <summary>
@@ -65,7 +65,7 @@ namespace osu.Game.Graphics.Containers
             return base.OnClick(state);
         }
 
-        protected virtual void OnStateChanged(Visibility visibility)
+        private void onStateChanged(Visibility visibility)
         {
             switch (visibility)
             {