From 4cde66240dcba75444ac1693aef3a117498cb122 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 21 Nov 2018 17:14:48 +0900
Subject: [PATCH] Fix default channels not being joined

---
 osu.Game/Online/Chat/ChannelManager.cs | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Online/Chat/ChannelManager.cs b/osu.Game/Online/Chat/ChannelManager.cs
index 9014fce18d..9ee6cfa483 100644
--- a/osu.Game/Online/Chat/ChannelManager.cs
+++ b/osu.Game/Online/Chat/ChannelManager.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// 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;
@@ -362,12 +362,6 @@ namespace osu.Game.Online.Chat
                             }
                         }
 
-                        if (!channelsInitialised)
-                        {
-                            channelsInitialised = true;
-                            // we want this to run after the first presence so we can see if the user is in any channels already.
-                            initializeChannels();
-                        }
 
                         //todo: handle left channels
 
@@ -379,6 +373,13 @@ namespace osu.Game.Online.Chat
                         lastMessageId = updates.Messages.LastOrDefault()?.Id ?? lastMessageId;
                     }
 
+                    if (!channelsInitialised)
+                    {
+                        channelsInitialised = true;
+                        // we want this to run after the first presence so we can see if the user is in any channels already.
+                        initializeChannels();
+                    }
+
                     fetchUpdates();
                 };