From ef8ef35d28daa3ea7dd542078ac9c0d3f7a9a5e2 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 30 Aug 2017 22:51:23 +0300
Subject: Move some variables to better scope.

---
 src/net/tmwa/chatrecv.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'src/net/tmwa/chatrecv.cpp')

diff --git a/src/net/tmwa/chatrecv.cpp b/src/net/tmwa/chatrecv.cpp
index d0ac861df..afa501004 100644
--- a/src/net/tmwa/chatrecv.cpp
+++ b/src/net/tmwa/chatrecv.cpp
@@ -129,12 +129,15 @@ void ChatRecv::processGmChat(Net::MessageIn &msg)
         return;
     }
 
-    std::string chatMsg = msg.readRawString(chatMsgLength, "message");
-
-    if (localChatTab != nullptr)
+    if (localChatTab != nullptr &&
+        chatWindow != nullptr)
+    {
+        std::string chatMsg = msg.readRawString(chatMsgLength, "message");
+        chatWindow->addGlobalMessage(chatMsg);
+    }
+    else
     {
-        if (chatWindow != nullptr)
-            chatWindow->addGlobalMessage(chatMsg);
+        msg.readRawString(chatMsgLength, "message");
     }
     BLOCK_END("ChatRecv::processChat")
 }
-- 
cgit v1.2.3-60-g2f50