h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-15 06:13:03 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into player-fixes

Browse Source
This commit is contained in:
Dan Balasescu 2017-05-16 18:54:55 +09:00 committed by GitHub
commit ca9c52ce38
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
osu.Game/Overlays/ChatOverlay.cs
View File

@ -284,10 +284,21 @@ namespace osu.Game.Overlays
{
if (channel == null) return;
careChannels.Add(channel);
channelTabs.AddItem(channel);
var existing = careChannels.Find(c => c.Id == channel.Id);
// we need to get a good number of messages initially for each channel we care about.
if (existing != null)
{
// if we already have this channel loaded, we don't want to make a second one.
channel = existing;
}
else
{
careChannels.Add(channel);
channelTabs.AddItem(channel);
}
// let's fetch a small number of messages to bring us up-to-date with the backlog.
fetchInitialMessages(channel);
if (CurrentChannel == null)