On room creation show room name in general tab caption.

Not allow move if in room.

2 files changed, 13 insertions, 9 deletions

diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index 2c1f580ad..853d2a51c 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -1219,12 +1219,6 @@ ChatTab *ChatWindow::addSpecialChannelTab(const std::string &name,
     return ret;
 }
 
-ChatTab *ChatWindow::addChatRoomTab(const std::string &name,
-                                    const bool switchTo)
-{
-    return nullptr;
-}
-
 ChatTab *ChatWindow::addChannelTab(const std::string &name,
                                    const bool switchTo)
 {
@@ -2132,3 +2126,14 @@ void ChatWindow::debugMessage(const std::string &msg)
     if (debugChatTab)
         debugChatTab->chatLog(msg, ChatMsgType::BY_SERVER);
 }
+
+void ChatWindow::joinRoom(const bool isJoin)
+{
+    Tab *const tab = mChatTabs->getTabByIndex(0);
+    std::string name;
+    if (isJoin)
+        name = PlayerInfo::getRoomName();
+    else
+        name = _("General");
+    tab->setCaption(name);
+}
diff --git a/src/gui/windows/chatwindow.h b/src/gui/windows/chatwindow.h
index 33d6a89bd..479d7db6a 100644
--- a/src/gui/windows/chatwindow.h
+++ b/src/gui/windows/chatwindow.h
@@ -199,9 +199,6 @@ class ChatWindow final : public Window,
 
         WhisperTab *getWhisperTab(const std::string &nick) const A_WARN_UNUSED;
 
-        ChatTab *addChatRoomTab(const std::string &name,
-                                const bool switchTo = false);
-
         ChatTab *addChannelTab(const std::string &name,
                                const bool switchTo = false);
 
@@ -212,6 +209,8 @@ class ChatWindow final : public Window,
                             const bool switchTo,
                             const bool join) A_WARN_UNUSED;
 
+        void joinRoom(const bool isJoin);
+
         void removeAllWhispers();
 
         void removeAllChannels();