From 87070289fd839b5be40e7cb9531d43921a10a99a Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Sat, 7 May 2022 19:03:58 +0200
Subject: Activate window that already has the room open if possible

---
 src/timeline/TimelineViewManager.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/timeline/TimelineViewManager.cpp')

diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp
index b37e24b0..58426178 100644
--- a/src/timeline/TimelineViewManager.cpp
+++ b/src/timeline/TimelineViewManager.cpp
@@ -222,7 +222,10 @@ void
 TimelineViewManager::showEvent(const QString &room_id, const QString &event_id)
 {
     if (auto room = rooms_->getRoomById(room_id)) {
-        if (rooms_->currentRoom() != room) {
+        auto exWin = MainWindow::instance()->windowForRoom(room_id);
+        if (exWin) {
+            exWin->requestActivate();
+        } else if (rooms_->currentRoom() != room) {
             rooms_->setCurrentRoom(room_id);
             MainWindow::instance()->requestActivate();
             nhlog::ui()->info("Activated room {}", room_id.toStdString());
-- 
cgit 1.5.1