Merge pull request #2300 from peppy/fix-skin-event-again

Move binding to LoadComplete

osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs

@@ -45,6 +45,11 @@ namespace osu.Game.Input.Bindings
         private void load(KeyBindingStore keyBindings)
         {
             store = keyBindings;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
             store.KeyBindingChanged += ReloadMappings;
         }
 

osu.Game/Skinning/LocalSkinOverrideContainer.cs

@@ -55,14 +55,19 @@ namespace osu.Game.Skinning
             var dependencies = new DependencyContainer(base.CreateLocalDependencies(parent));
 
             fallbackSource = dependencies.Get<ISkinSource>();
-            if (fallbackSource != null)
-                fallbackSource.SourceChanged += onSourceChanged;
-
             dependencies.CacheAs<ISkinSource>(this);
 
             return dependencies;
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            if (fallbackSource != null)
+                fallbackSource.SourceChanged += onSourceChanged;
+        }
+
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);