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

Fix a spurious NRE in GlobalChat

Browse Source
This commit is contained in:
Oliver Brakmann
2016-05-08 12:32:34 +02:00
parent bd7e53bec4
commit d049413c26
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Game/GlobalChat.cs
View File

@@ -241,7 +241,7 @@ namespace OpenRA.Chat
void OnJoin(object sender, JoinEventArgs e) void OnJoin(object sender, JoinEventArgs e)
{ {
if (e.Who == client.Nickname || e.Channel != channel.Name) if (e.Who == client.Nickname || channel == null || e.Channel != channel.Name)
return; return;
AddNotification("{0} joined the chat.".F(e.Who)); AddNotification("{0} joined the chat.".F(e.Who));
@@ -284,7 +284,7 @@ namespace OpenRA.Chat
void OnPart(object sender, PartEventArgs e) void OnPart(object sender, PartEventArgs e)
{ {
if (e.Data.Channel != channel.Name) if (channel == null || e.Data.Channel != channel.Name)
return; return;
AddNotification("{0} left the chat.".F(e.Who)); AddNotification("{0} left the chat.".F(e.Who));