From 9d650519c73b176d65d6a1046ddbbd10bcc72fe4 Mon Sep 17 00:00:00 2001
From: Tobias Fella <fella@posteo.de>
Date: Fri, 24 May 2024 14:17:37 +0200
Subject: [PATCH] Don't suggest joining the last opened room when neochat is
 started after the cache was cleared

---
 src/roommanager.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/roommanager.cpp b/src/roommanager.cpp
index a4c3cfc53..29accb5ec 100644
--- a/src/roommanager.cpp
+++ b/src/roommanager.cpp
@@ -239,10 +239,11 @@ void RoomManager::openRoomForActiveConnection()
     if (!m_connection) {
         m_currentRoom = nullptr;
     }
-    if (m_lastRoomConfig.readEntry(m_connection->userId(), QString()).isEmpty()) {
+    const auto &lastRoom = m_lastRoomConfig.readEntry(m_connection->userId(), QString());
+    if (lastRoom.isEmpty() || !m_connection->room(lastRoom)) {
         setCurrentRoom({});
     } else {
-        resolveResource(m_lastRoomConfig.readEntry(m_connection->userId(), QString()));
+        resolveResource(lastRoom);
     }
     setCurrentSpace(m_lastSpaceConfig.readEntry(m_connection->userId(), QString()), false);
 }