From 84e2c79004f42656660a32f4b54277954f7ec631 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 13 Oct 2014 16:50:23 +0300
Subject: eathena: show channel messages in channel tab.

---
 src/gui/widgets/tabs/chat/chattab.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/gui/widgets/tabs/chat')

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
-- 
cgit v1.2.3-70-g09d2