Don't switch to global DMs when space contains DM

2025-10-05 17:43:14 +02:00
parent 5c49c35b82
commit ba4a83d38c
1 changed files with 2 additions and 1 deletions
--- a/src/app/roommanager.cpp
+++ b/src/app/roommanager.cpp
@@ -576,7 +576,8 @@ void RoomManager::setCurrentRoom(const QString &roomId)
        return;
    }
    if (m_currentRoom->isDirectChat()) {
-        if (m_currentSpaceId != "DM"_L1) {
+        const auto roomsInSpace = SpaceHierarchyCache::instance().getRoomListForSpace(m_currentSpaceId, false);
+        if (!roomsInSpace.contains(m_currentRoom->id()) && m_currentSpaceId != "DM"_L1) {
            setCurrentSpace("DM"_L1, false);
        }
        return;