From 77e241b9e57a3248e2efb16e6cb081a19a666db7 Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Thu, 3 Sep 2020 19:34:17 +0200
Subject: Reenable top bar room settings menus on avatar or title clicks

Also fixes a bug with an empty room settings window introduced in the
port.
---
 src/ChatPage.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/ChatPage.cpp')

diff --git a/src/ChatPage.cpp b/src/ChatPage.cpp
index 1339f353..cf1a6062 100644
--- a/src/ChatPage.cpp
+++ b/src/ChatPage.cpp
@@ -225,6 +225,9 @@ ChatPage::ChatPage(QSharedPointer<UserSettings> userSettings, QWidget *parent)
                 }
         });
 
+        connect(room_list_, &RoomList::roomChanged, this, [this](QString room_id) {
+                this->current_room_ = room_id;
+        });
         connect(room_list_, &RoomList::roomChanged, text_input_, &TextInputWidget::stopTyping);
         connect(room_list_, &RoomList::roomChanged, splitter, &Splitter::showChatView);
         connect(room_list_, &RoomList::roomChanged, text_input_, &TextInputWidget::focusLineEdit);
-- 
cgit 1.5.1