From 9473b53226abb8021335fec61d7f786c4da56957 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 Feb 2019 14:30:04 +0900
Subject: [PATCH] Avoid redundant (synchronous) skin change

---
 .../Skinning/LocalSkinOverrideContainer.cs    | 27 +++++++------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Skinning/LocalSkinOverrideContainer.cs b/osu.Game/Skinning/LocalSkinOverrideContainer.cs
index 36e95f4038..349a4ea9d8 100644
--- a/osu.Game/Skinning/LocalSkinOverrideContainer.cs
+++ b/osu.Game/Skinning/LocalSkinOverrideContainer.cs
@@ -71,27 +71,20 @@ protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnl
             var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
 
             fallbackSource = dependencies.Get<ISkinSource>();
-            dependencies.CacheAs<ISkinSource>(this);
-
-            return dependencies;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config)
-        {
-            config.BindWith(OsuSetting.BeatmapSkins, beatmapSkins);
-            config.BindWith(OsuSetting.BeatmapHitsounds, beatmapHitsounds);
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
             if (fallbackSource != null)
                 fallbackSource.SourceChanged += onSourceChanged;
 
+            dependencies.CacheAs<ISkinSource>(this);
+
+            var config = dependencies.Get<OsuConfigManager>();
+
+            config.BindWith(OsuSetting.BeatmapSkins, beatmapSkins);
+            config.BindWith(OsuSetting.BeatmapHitsounds, beatmapHitsounds);
+
             beatmapSkins.BindValueChanged(_ => onSourceChanged());
-            beatmapHitsounds.BindValueChanged(_ => onSourceChanged(), true);
+            beatmapHitsounds.BindValueChanged(_ => onSourceChanged());
+
+            return dependencies;
         }
 
         protected override void Dispose(bool isDisposing)