diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-08-30 22:51:23 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-08-30 22:51:23 +0300 |
| commit | ef8ef35d28daa3ea7dd542078ac9c0d3f7a9a5e2 (patch) | |
| tree | c3d7c79fca18ac387d0c90512ef3201c92da5890 /src/net/tmwa/chatrecv.cpp | |
| parent | 22b64d16b613c1e5b26632237879b167024788ab (diff) | |
| download | mv-ef8ef35d28daa3ea7dd542078ac9c0d3f7a9a5e2.tar.gz mv-ef8ef35d28daa3ea7dd542078ac9c0d3f7a9a5e2.tar.bz2 mv-ef8ef35d28daa3ea7dd542078ac9c0d3f7a9a5e2.tar.xz mv-ef8ef35d28daa3ea7dd542078ac9c0d3f7a9a5e2.zip | |
Move some variables to better scope.
Diffstat (limited to 'src/net/tmwa/chatrecv.cpp')
| -rw-r--r-- | src/net/tmwa/chatrecv.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
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") } |