summaryrefslogtreecommitdiff
path: root/src/net/eathena
diff options
context:
space:
mode:
Diffstat (limited to 'src/net/eathena')
-rw-r--r--src/net/eathena/chathandler.cpp15
1 files changed, 13 insertions, 2 deletions
diff --git a/src/net/eathena/chathandler.cpp b/src/net/eathena/chathandler.cpp
index 4e2c9969c..8e7417427 100644
--- a/src/net/eathena/chathandler.cpp
+++ b/src/net/eathena/chathandler.cpp
@@ -378,8 +378,19 @@ void ChatHandler::processColorChat(Net::MessageIn &msg)
return;
}
- processChatContinue(msg.readRawString(chatMsgLength, "message"),
- ChatMsgType::BY_UNKNOWN);
+ std::string message = msg.readRawString(chatMsgLength, "message");
+ std::string msg2 = message;
+ if (findCutFirst(msg2, "You're now in the '#") && findCutLast(msg2, "'"))
+ {
+ const size_t idx = msg2.find("' channel for '");
+ if (idx != std::string::npos && chatWindow)
+ {
+ chatWindow->addChannelTab(std::string("#").append(
+ msg2.substr(0, idx)), false);
+ return;
+ }
+ }
+ processChatContinue(message, ChatMsgType::BY_UNKNOWN);
}
std::string ChatHandler::extractChannelFromMessage(std::string &chatMsg,