From bc6f71fe97d150e2dc1911efececb14edce39de0 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Sat, 18 Jan 2020 15:27:55 +0100
Subject: [PATCH] Preserve current channel if ChatOverlay is being loaded in

---
 osu.Game/Overlays/Chat/Tabs/ChannelTabControl.cs | 7 ++++---
 osu.Game/Overlays/ChatOverlay.cs                 | 8 +++++++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Chat/Tabs/ChannelTabControl.cs b/osu.Game/Overlays/Chat/Tabs/ChannelTabControl.cs
index 4b1d595b44..e30c1678d5 100644
--- a/osu.Game/Overlays/Chat/Tabs/ChannelTabControl.cs
+++ b/osu.Game/Overlays/Chat/Tabs/ChannelTabControl.cs
@@ -59,15 +59,16 @@ namespace osu.Game.Overlays.Chat.Tabs
 
         /// <summary>
         /// Adds a channel to the ChannelTabControl.
-        /// The first channel added will automaticly selected.
+        /// The first channel added will automaticly selected if <paramref name="setChannel"/> is true.
         /// </summary>
         /// <param name="channel">The channel that is going to be added.</param>
-        public void AddChannel(Channel channel)
+        /// <param name="setChannel">If the current channel should be changed if none was selected before</param>
+        public void AddChannel(Channel channel, bool setChannel = true)
         {
             if (!Items.Contains(channel))
                 AddItem(channel);
 
-            if (Current.Value == null)
+            if (Current.Value == null && setChannel)
                 Current.Value = channel;
         }
 
diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index 44772da3c1..4e69e4c9fc 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -221,8 +221,14 @@ namespace osu.Game.Overlays
                 // TODO: consider scheduling bindable callbacks to not perform when overlay is not present.
                 channelManager.JoinedChannels.ItemsAdded += onChannelAddedToJoinedChannels;
                 channelManager.JoinedChannels.ItemsRemoved += onChannelRemovedFromJoinedChannels;
+
+                bool channelSelected = channelManager.CurrentChannel.Value != null;
+
                 foreach (Channel channel in channelManager.JoinedChannels)
-                    ChannelTabControl.AddChannel(channel);
+                    ChannelTabControl.AddChannel(channel, !channelSelected);
+
+                if (channelSelected)
+                    ChannelTabControl.Current.Value = channelManager.CurrentChannel.Value;
 
                 channelManager.AvailableChannels.ItemsAdded += availableChannelsChanged;
                 channelManager.AvailableChannels.ItemsRemoved += availableChannelsChanged;