2 files changed, 36 insertions, 22 deletions

diff --git a/src/net/eathena/chathandler.cpp b/src/net/eathena/chathandler.cpp
index 14c0fcea5..22ec532ce 100644
--- a/src/net/eathena/chathandler.cpp
+++ b/src/net/eathena/chathandler.cpp
@@ -85,11 +85,14 @@ void ChatHandler::handleMessage(Net::MessageIn &msg)
             break;
 
         case SMSG_PLAYER_CHAT:
-        case SMSG_GM_CHAT:
         case SMSG_COLOR_MESSAGE:
             processChat(msg);
             break;
 
+        case SMSG_GM_CHAT:
+            processGmChat(msg);
+            break;
+
         case SMSG_GM_CHAT2:
             processGmChat2(msg);
             break;
@@ -263,7 +266,6 @@ void ChatHandler::createChatRoom(const std::string &title,
 void ChatHandler::processChat(Net::MessageIn &msg)
 {
     BLOCK_START("ChatHandler::processChat")
-    const bool normalChat = msg.getId() == SMSG_PLAYER_CHAT;
     const bool coloredChat = msg.getId() == SMSG_COLOR_MESSAGE;
     int chatMsgLength = msg.readInt16("len") - 4;
     if (coloredChat)
@@ -281,33 +283,43 @@ void ChatHandler::processChat(Net::MessageIn &msg)
     std::string chatMsg = msg.readRawString(chatMsgLength, "message");
     const size_t pos = chatMsg.find(" : ", 0);
 
-    if (normalChat)
+    bool allow(true);
+    if (chatWindow)
     {
-        bool allow(true);
-        if (chatWindow)
-        {
-            allow = chatWindow->resortChatLog(chatMsg,
-                ChatMsgType::BY_PLAYER,
-                GENERAL_CHANNEL,
-                false, true);
-        }
+        allow = chatWindow->resortChatLog(chatMsg,
+            ChatMsgType::BY_PLAYER,
+            GENERAL_CHANNEL,
+            false, true);
+    }
 
-        if (pos != std::string::npos)
-            chatMsg.erase(0, pos + 3);
+    if (pos != std::string::npos)
+        chatMsg.erase(0, pos + 3);
 
-        trim(chatMsg);
+    trim(chatMsg);
 
-        if (localPlayer)
-        {
-            if ((chatWindow || mShowMotd) && allow)
-                localPlayer->setSpeech(chatMsg, GENERAL_CHANNEL);
-        }
+    if (localPlayer)
+    {
+        if ((chatWindow || mShowMotd) && allow)
+            localPlayer->setSpeech(chatMsg, GENERAL_CHANNEL);
     }
-    else if (localChatTab)
+    BLOCK_END("ChatHandler::processChat")
+}
+
+void ChatHandler::processGmChat(Net::MessageIn &msg)
+{
+    BLOCK_START("ChatHandler::processChat")
+    int chatMsgLength = msg.readInt16("len") - 4;
+    if (chatMsgLength <= 0)
     {
-        if (chatWindow)
-            chatWindow->addGlobalMessage(chatMsg);
+        BLOCK_END("ChatHandler::processChat")
+        return;
     }
+
+    std::string chatMsg = msg.readRawString(chatMsgLength, "message");
+    const size_t pos = chatMsg.find(" : ", 0);
+
+    if (chatWindow)
+        chatWindow->addGlobalMessage(chatMsg);
     BLOCK_END("ChatHandler::processChat")
 }
 
diff --git a/src/net/eathena/chathandler.h b/src/net/eathena/chathandler.h
index 29eca423b..b59019fef 100644
--- a/src/net/eathena/chathandler.h
+++ b/src/net/eathena/chathandler.h
@@ -77,6 +77,8 @@ class ChatHandler final : public MessageHandler, public Ea::ChatHandler
 
         void processWhisperResponse(Net::MessageIn &msg);
 
+        void processGmChat(Net::MessageIn &msg);
+
         void processGmChat2(Net::MessageIn &msg);
 
         void processChatIgnoreList(Net::MessageIn &msg);