diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-10-13 16:50:23 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-10-13 16:50:23 +0300 |
| commit | 84e2c79004f42656660a32f4b54277954f7ec631 (patch) | |
| tree | f83d6d2d22bd38145cac2a1023000db7d3c2e74a /src/gui/widgets/tabs | |
| parent | 00345798a405d4e28f489d01a2dea6afb01a6c18 (diff) | |
| download | mv-84e2c79004f42656660a32f4b54277954f7ec631.tar.gz mv-84e2c79004f42656660a32f4b54277954f7ec631.tar.bz2 mv-84e2c79004f42656660a32f4b54277954f7ec631.tar.xz mv-84e2c79004f42656660a32f4b54277954f7ec631.zip | |
eathena: show channel messages in channel tab.
Diffstat (limited to 'src/gui/widgets/tabs')
| -rw-r--r-- | src/gui/widgets/tabs/chat/chattab.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/widgets/tabs/chat/chattab.cpp b/src/gui/widgets/tabs/chat/chattab.cpp index 5dc18b329..3ba1ee00a 100644 --- a/src/gui/widgets/tabs/chat/chattab.cpp +++ b/src/gui/widgets/tabs/chat/chattab.cpp @@ -43,6 +43,7 @@ #include "input/inputmanager.h" #include "net/chathandler.h" +#include "net/serverfeatures.h" #include "resources/iteminfo.h" @@ -217,7 +218,8 @@ void ChatTab::chatLog(std::string line, ChatMsgType::Type own, } // if configured, move magic messages log to debug chat tab - if (localChatTab && this == localChatTab + if (!serverFeatures->haveChatChannels() + && localChatTab && this == localChatTab && ((config.getBoolValue("showMagicInDebug") && own == ChatMsgType::BY_PLAYER && tmp.text.length() > 1 |