From 256baf6d60f10fe2187ba45bfc24d634e9fb2b52 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 24 Mar 2018 05:40:26 +0900
Subject: [PATCH 1/3] Move binding to LoadComplete

Previously there was a chance that it would still never get disposed, as the event was bound in async load, before it was in a state it can be recursively disposed via the PlayerLoader call.
---
 osu.Game/Skinning/LocalSkinOverrideContainer.cs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Skinning/LocalSkinOverrideContainer.cs b/osu.Game/Skinning/LocalSkinOverrideContainer.cs
index d000127859..95cdde2f48 100644
--- a/osu.Game/Skinning/LocalSkinOverrideContainer.cs
+++ b/osu.Game/Skinning/LocalSkinOverrideContainer.cs
@@ -55,14 +55,19 @@ protected override IReadOnlyDependencyContainer CreateLocalDependencies(IReadOnl
             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);

From 3844e95656a756286f8c31106bea35026b3af904 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 24 Mar 2018 05:55:56 +0900
Subject: [PATCH 2/3] Fix one more instance of the same thing happening

---
 osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs b/osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs
index b6bc348a52..2b53f77d62 100644
--- a/osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs
+++ b/osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs
@@ -45,6 +45,11 @@ public DatabasedKeyBindingContainer(RulesetInfo ruleset = null, int? variant = n
         private void load(KeyBindingStore keyBindings)
         {
             store = keyBindings;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
             store.KeyBindingChanged += ReloadMappings;
         }
 

From ade97f8c0c2ca3a93b2e3ebec01b6e1847416148 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 24 Mar 2018 05:58:59 +0900
Subject: [PATCH 3/3] Increase deploy delta keep

---
 osu.Desktop.Deploy/Program.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Desktop.Deploy/Program.cs b/osu.Desktop.Deploy/Program.cs
index d8ff2bfd82..3a716468c9 100644
--- a/osu.Desktop.Deploy/Program.cs
+++ b/osu.Desktop.Deploy/Program.cs
@@ -39,7 +39,7 @@ internal static class Program
         /// <summary>
         /// How many previous build deltas we want to keep when publishing.
         /// </summary>
-        private const int keep_delta_count = 3;
+        private const int keep_delta_count = 4;
 
         private static string codeSigningCmd => string.IsNullOrEmpty(codeSigningPassword) ? "" : $"-n \"/a /f {codeSigningCertPath} /p {codeSigningPassword} /t http://timestamp.comodoca.com/authenticode\"";