From 231f7939a684377bdaf8aeba6099e65ae29a5cf3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 May 2017 12:41:37 +0900
Subject: [PATCH 1/3] Fix channels being unnecessarily recycled on disconnect

Resolves #768
---
 osu.Game/Overlays/ChatOverlay.cs | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index a85af251c5..cbcfbbfd9e 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -206,18 +206,12 @@ namespace osu.Game.Overlays
 
         private long? lastMessageId;
 
-        private List<Channel> careChannels;
+        private List<Channel> careChannels = new List<Channel>();
 
         private readonly List<DrawableChannel> loadedChannels = new List<DrawableChannel>();
 
         private void initializeChannels()
         {
-            currentChannelContainer.Clear();
-
-            loadedChannels.Clear();
-
-            careChannels = new List<Channel>();
-
             SpriteText loading;
             Add(loading = new OsuSpriteText
             {
@@ -232,8 +226,6 @@ namespace osu.Game.Overlays
             ListChannelsRequest req = new ListChannelsRequest();
             req.Success += delegate (List<Channel> channels)
             {
-                Debug.Assert(careChannels.Count == 0);
-
                 Scheduler.Add(delegate
                 {
                     loading.FadeOut(100);

From cba77967777da8f22469ae31b2f0f31bc34dbbf3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 May 2017 18:49:30 +0900
Subject: [PATCH 2/3] Fix ratio container being added to a level too high

That's a bad ratio container! How did we not notice this until now?
---
 osu.Game/OsuGameBase.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 7e16030ec3..2c39a82245 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -146,7 +146,7 @@ namespace osu.Game
         {
             base.LoadComplete();
 
-            AddInternal(ratioContainer = new RatioAdjust
+            base.Content.Add(ratioContainer = new RatioAdjust
             {
                 Children = new Drawable[]
                 {

From d606b5b3a73a70c51d8f89c06bebe2d753f85a6e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 May 2017 22:13:56 +0900
Subject: [PATCH 3/3] Fix CI warning

---
 osu.Game/Overlays/ChatOverlay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index cbcfbbfd9e..2836be22ae 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -206,7 +206,7 @@ namespace osu.Game.Overlays
 
         private long? lastMessageId;
 
-        private List<Channel> careChannels = new List<Channel>();
+        private readonly List<Channel> careChannels = new List<Channel>();
 
         private readonly List<DrawableChannel> loadedChannels = new List<DrawableChannel>();