epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #10334 from obrakmann/fix10331_suppress-unread-irc-notifications

Browse Source 
Fix counting IRC notifications as unread messages
This commit is contained in:
RoosterDragon
2015-12-30 22:25:17 +00:00
parent f364a306f3 7858ba16c4
commit 47aafc7936
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyLogic.cs
View File

@@ -13,6 +13,7 @@ using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using System.Linq; using System.Linq;
using System.Threading; using System.Threading;
using OpenRA.Chat;
using OpenRA.Graphics; using OpenRA.Graphics;
using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits;
using OpenRA.Network; using OpenRA.Network;
@@ -596,7 +597,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
return globalChatLabel + " ({0})".F(globalChatUnreadMessages); return globalChatLabel + " ({0})".F(globalChatUnreadMessages);
}; };
globalChatLastReadMessages = Game.GlobalChat.History.Count; globalChatLastReadMessages = Game.GlobalChat.History.Count(m => m.Type == ChatMessageType.Message);
var lobbyChat = lobby.Get("LOBBYCHAT"); var lobbyChat = lobby.Get("LOBBYCHAT");
lobbyChat.IsVisible = () => chatPanel == ChatPanelType.Lobby; lobbyChat.IsVisible = () => chatPanel == ChatPanelType.Lobby;
@@ -678,7 +679,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
public override void Tick() public override void Tick()
{ {
var newMessages = Game.GlobalChat.History.Count; var newMessages = Game.GlobalChat.History.Count(m => m.Type == ChatMessageType.Message);
globalChatUnreadMessages += newMessages - globalChatLastReadMessages; globalChatUnreadMessages += newMessages - globalChatLastReadMessages;
globalChatLastReadMessages = newMessages; globalChatLastReadMessages = newMessages;