Null check channel message params before doing anything else

Author: Xinayder

Client/ChatWorker.cs

@@ -333,24 +333,28 @@ public void QueueChatLeave(string playerName, string channelName)
 
         public void QueueChannelMessage(string fromPlayer, string channelName, string channelMessage)
         {
-            ChannelEntry ce = new ChannelEntry();
-            ce.fromPlayer = fromPlayer;
-            ce.channel = channelName;
-            ce.message = channelMessage;
-            newChannelMessages.Enqueue(ce);
-            if (!display)
+            // Check if any of these is null before doing anything else
+            if (!string.IsNullOrEmpty(fromPlayer) && !string.IsNullOrEmpty(channelMessage))
             {
-                if (ce.fromPlayer != consoleIdentifier)
-                {
-                    chatButtonHighlighted = true;
-                }
-                if (ce.channel != "")
+                ChannelEntry ce = new ChannelEntry();
+                ce.fromPlayer = fromPlayer;
+                ce.channel = channelName;
+                ce.message = channelMessage;
+                newChannelMessages.Enqueue(ce);
+                if (!display)
                 {
-                    ScreenMessages.PostScreenMessage(ce.fromPlayer + " -> #" + ce.channel + ": " + ce.message, 5f, ScreenMessageStyle.UPPER_LEFT);
-                }
-                else
-                {
-                    ScreenMessages.PostScreenMessage(ce.fromPlayer + " -> #Global : " + ce.message, 5f, ScreenMessageStyle.UPPER_LEFT);
+                    if (ce.fromPlayer != consoleIdentifier)
+                    {
+                        chatButtonHighlighted = true;
+                    }
+                    if (!string.IsNullOrEmpty(ce.channel))
+                    {
+                        ScreenMessages.PostScreenMessage(ce.fromPlayer + " -> #" + ce.channel + ": " + ce.message, 5f, ScreenMessageStyle.UPPER_LEFT);
+                    }
+                    else
+                    {
+                        ScreenMessages.PostScreenMessage(ce.fromPlayer + " -> #Global : " + ce.message, 5f, ScreenMessageStyle.UPPER_LEFT);
+                    }
                 }
             }
         }