From be66c0e9127982166e393e697daa9d4c2d5db938 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 11 Sep 2019 19:06:31 +0900
Subject: [PATCH] Fix potential of toggle between load and LoadComplete

---
 .../Graphics/Containers/OsuFocusedOverlayContainer.cs    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs b/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
index 0ce095d44f..a1df973b60 100644
--- a/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
+++ b/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
@@ -41,6 +41,12 @@ public abstract class OsuFocusedOverlayContainer : FocusedOverlayContainer, IPre
 
         [BackgroundDependencyLoader(true)]
         private void load(AudioManager audio)
+        {
+            samplePopIn = audio.Samples.Get(@"UI/overlay-pop-in");
+            samplePopOut = audio.Samples.Get(@"UI/overlay-pop-out");
+        }
+
+        protected override void LoadComplete()
         {
             OverlayActivationMode.ValueChanged += mode =>
             {
@@ -51,8 +57,7 @@ private void load(AudioManager audio)
             if (game != null)
                 OverlayActivationMode.BindTo(game.OverlayActivationMode);
 
-            samplePopIn = audio.Samples.Get(@"UI/overlay-pop-in");
-            samplePopOut = audio.Samples.Get(@"UI/overlay-pop-out");
+            base.LoadComplete();
         }
 
         /// <summary>