From d049413c26e581ed3d306abe56209c4de67e4a9d Mon Sep 17 00:00:00 2001 From: Oliver Brakmann Date: Sun, 8 May 2016 12:32:34 +0200 Subject: [PATCH] Fix a spurious NRE in GlobalChat --- OpenRA.Game/GlobalChat.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenRA.Game/GlobalChat.cs b/OpenRA.Game/GlobalChat.cs index d8bd5c32e3..d3b19b4743 100644 --- a/OpenRA.Game/GlobalChat.cs +++ b/OpenRA.Game/GlobalChat.cs @@ -241,7 +241,7 @@ namespace OpenRA.Chat 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; AddNotification("{0} joined the chat.".F(e.Who)); @@ -284,7 +284,7 @@ namespace OpenRA.Chat void OnPart(object sender, PartEventArgs e) { - if (e.Data.Channel != channel.Name) + if (channel == null || e.Data.Channel != channel.Name) return; AddNotification("{0} left the chat.".F(e.Who));