From 36574fe72662e807ec679e6f54a32685ee23ee57 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 3 Nov 2013 20:33:28 +0300
Subject: allow special server messgaes before motd if motd is hidden.

Also always show motd in debug tab.
---
 src/net/ea/chathandler.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/net')

diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp
index 0c34291c4..6346f63ff 100644
--- a/src/net/ea/chathandler.cpp
+++ b/src/net/ea/chathandler.cpp
@@ -335,15 +335,6 @@ void ChatHandler::processChat(Net::MessageIn &msg, const bool normalChat,
 
     if (normalChat)
     {
-        if (chatMsg.find(": ") == std::string::npos && !mShowMotd
-            && mSkipping && channel.empty())
-        {
-            // skip motd from "new" tmw server
-            return;
-        }
-
-        mSkipping = true;
-
         if (chatWindow)
         {
             chatWindow->resortChatLog(chatMsg, BY_PLAYER,
@@ -360,6 +351,15 @@ void ChatHandler::processChat(Net::MessageIn &msg, const bool normalChat,
             }
         }
 
+        if (chatMsg.find(": ") == std::string::npos && !mShowMotd
+            && mSkipping && channel.empty())
+        {
+            // skip motd from "new" tmw server
+            return;
+        }
+
+        mSkipping = false;
+
         if (pos != std::string::npos)
             chatMsg.erase(0, pos + 3);
 
-- 
cgit v1.2.3-60-g2f50