From 2dd3e513732d7c0cde6ecd5e0c8d0b3543d337ae Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Aug 2017 10:51:28 +0900
Subject: [PATCH 1/3] Ensure other full-screen overlays are closed when direct
 is open (and vice-versa)

---
 osu.Game/OsuGame.cs | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 43e3731166..82177ab05e 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -226,6 +226,23 @@ namespace osu.Game
             dependencies.Cache(notificationOverlay);
             dependencies.Cache(dialogOverlay);
 
+            // ensure only one of these overlays are open at once.
+            var singleDisplayOverlays = new OverlayContainer[] { chat, social, direct };
+            foreach (var overlay in singleDisplayOverlays)
+            {
+                overlay.StateChanged += (container, state) =>
+                {
+                    if (state == Visibility.Hidden) return;
+
+                    foreach (var c in singleDisplayOverlays)
+                    {
+                        if (c == container) continue;
+                        c.State = Visibility.Hidden;
+                    }
+                };
+            }
+
+
             // ensure both overlays aren't presented at the same time
             chat.StateChanged += (container, state) => social.State = state == Visibility.Visible ? Visibility.Hidden : social.State;
             social.StateChanged += (container, state) => chat.State = state == Visibility.Visible ? Visibility.Hidden : chat.State;

From 67b3cbce2f9fa436d19f5ffa77982c83521a3442 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Aug 2017 13:04:32 +0900
Subject: [PATCH 2/3] Fix beatmap background being disposed too early

Causes weird transitions on the music controller
---
 osu.Game/OsuGameBase.cs              |  8 ++------
 osu.Game/Overlays/MusicController.cs | 12 ++++++------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 952dc900a2..a7136ce803 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -152,14 +152,10 @@ namespace osu.Game
 
             Beatmap.ValueChanged += b =>
             {
-                // compare to last baetmap as sometimes the two may share a track representation (optimisation, see WorkingBeatmap.TransferTo)
+                // compare to last beatmap as sometimes the two may share a track representation (optimisation, see WorkingBeatmap.TransferTo)
                 if (lastBeatmap?.Track != b.Track)
                 {
-                    // this disposal is done to stop the audio track.
-                    // it may not be exactly what we want for cases beatmaps are reused, as it will
-                    // trigger a fresh load of contained resources.
-                    lastBeatmap?.Dispose();
-
+                    lastBeatmap?.Track?.Dispose();
                     Audio.Track.AddItem(b.Track);
                 }
 
diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index f2c90f009a..cb4628825e 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -348,23 +348,23 @@ namespace osu.Game.Overlays
 
                 playerContainer.Add(new AsyncLoadWrapper(new Background(beatmap)
                 {
-                    OnLoadComplete = d =>
+                    OnLoadComplete = newBackground =>
                     {
                         switch (direction)
                         {
                             case TransformDirection.Next:
-                                d.Position = new Vector2(400, 0);
-                                d.MoveToX(0, 500, Easing.OutCubic);
+                                newBackground.Position = new Vector2(400, 0);
+                                newBackground.MoveToX(0, 500, Easing.OutCubic);
                                 currentBackground.MoveToX(-400, 500, Easing.OutCubic);
                                 break;
                             case TransformDirection.Prev:
-                                d.Position = new Vector2(-400, 0);
-                                d.MoveToX(0, 500, Easing.OutCubic);
+                                newBackground.Position = new Vector2(-400, 0);
+                                newBackground.MoveToX(0, 500, Easing.OutCubic);
                                 currentBackground.MoveToX(400, 500, Easing.OutCubic);
                                 break;
                         }
                         currentBackground.Expire();
-                        currentBackground = d;
+                        currentBackground = newBackground;
                     }
                 })
                 {

From 72a16e31dd9468912df4c555d72ba10010e49adf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Aug 2017 13:07:10 +0900
Subject: [PATCH 3/3] Remove unnecessary old code

---
 osu.Game/OsuGame.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 82177ab05e..30bc09d50f 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -242,11 +242,6 @@ namespace osu.Game
                 };
             }
 
-
-            // ensure both overlays aren't presented at the same time
-            chat.StateChanged += (container, state) => social.State = state == Visibility.Visible ? Visibility.Hidden : social.State;
-            social.StateChanged += (container, state) => chat.State = state == Visibility.Visible ? Visibility.Hidden : chat.State;
-
             LoadComponentAsync(Toolbar = new Toolbar
             {
                 Depth = -4,