From b56eee1927f6c80bf777f2529687537fc9699e36 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 23 Mar 2018 15:04:40 +0900
Subject: [PATCH 1/2] Fix background loaded player never being disposed if
 early exit occurs

---
 osu.Game/Screens/Play/PlayerLoader.cs | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 89082cfbd5..6d55cdb9ca 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -1,6 +1,7 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -27,6 +28,8 @@ namespace osu.Game.Screens.Play
         private bool showOverlays = true;
         public override bool ShowOverlaysOnEnter => showOverlays;
 
+        private Task loadTask;
+
         public PlayerLoader(Player player)
         {
             this.player = player;
@@ -55,7 +58,7 @@ namespace osu.Game.Screens.Play
                 Margin = new MarginPadding(25)
             });
 
-            LoadComponentAsync(player);
+            loadTask = LoadComponentAsync(player);
         }
 
         protected override void OnResuming(Screen last)
@@ -65,7 +68,7 @@ namespace osu.Game.Screens.Play
             contentIn();
 
             //we will only be resumed if the player has requested a re-run (see ValidForResume setting above)
-            LoadComponentAsync(player = new Player
+            loadTask = LoadComponentAsync(player = new Player
             {
                 RestartCount = player.RestartCount + 1,
                 RestartRequested = player.RestartRequested,
@@ -154,6 +157,8 @@ namespace osu.Game.Screens.Play
                     {
                         if (!IsCurrentScreen) return;
 
+                        loadTask = null;
+
                         if (!Push(player))
                             Exit();
                         else
@@ -192,6 +197,14 @@ namespace osu.Game.Screens.Play
             return base.OnExiting(next);
         }
 
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            // if the player never got pushed, we should explicitly dispose it.
+            loadTask?.ContinueWith(_ => player.Dispose());
+        }
+
         private class BeatmapMetadataDisplay : Container
         {
             private class MetadataLine : Container

From eb751fa607d25c187947cb53bd4d7988f8824114 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 23 Mar 2018 15:05:28 +0900
Subject: [PATCH 2/2] Fix event unbind not being unbound correctly

---
 osu.Game/Skinning/LocalSkinOverrideContainer.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/LocalSkinOverrideContainer.cs b/osu.Game/Skinning/LocalSkinOverrideContainer.cs
index b7e2bd0daf..d000127859 100644
--- a/osu.Game/Skinning/LocalSkinOverrideContainer.cs
+++ b/osu.Game/Skinning/LocalSkinOverrideContainer.cs
@@ -48,13 +48,15 @@ namespace osu.Game.Skinning
             this.source = source;
         }
 
+        private void onSourceChanged() => SourceChanged?.Invoke();
+
         protected override IReadOnlyDependencyContainer CreateLocalDependencies(IReadOnlyDependencyContainer parent)
         {
             var dependencies = new DependencyContainer(base.CreateLocalDependencies(parent));
 
             fallbackSource = dependencies.Get<ISkinSource>();
             if (fallbackSource != null)
-                fallbackSource.SourceChanged += () => SourceChanged?.Invoke();
+                fallbackSource.SourceChanged += onSourceChanged;
 
             dependencies.CacheAs<ISkinSource>(this);
 
@@ -66,7 +68,7 @@ namespace osu.Game.Skinning
             base.Dispose(isDisposing);
 
             if (fallbackSource != null)
-                fallbackSource.SourceChanged -= SourceChanged;
+                fallbackSource.SourceChanged -= onSourceChanged;
         }
     }
 }