sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-03 01:09:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into ChatManager_with_BindableCollection

Browse Source
This commit is contained in:
smoogipoo
2018-11-26 16:12:55 +09:00
parent f8809505d9 e94c5dfabe
commit efdad3a3a7
28 changed files with 281 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Online/Chat/ChannelManager.cs
View File

@ -274,11 +274,13 @@ namespace osu.Game.Online.Chat
{
Channel found = null;
var available = AvailableChannels.FirstOrDefault(c => c.Id == lookup.Id);
bool lookupCondition(Channel ch) => lookup.Id > 0 ? ch.Id == lookup.Id : lookup.Name == ch.Name;
var available = AvailableChannels.FirstOrDefault(lookupCondition);
if (available != null)
found = available;
var joined = JoinedChannels.FirstOrDefault(c => c.Id == lookup.Id);
var joined = JoinedChannels.FirstOrDefault(lookupCondition);
if (found == null && joined != null)
found = joined;