From ba4a83d38ce2bdbce538cec806c9fefd76b3cf1e Mon Sep 17 00:00:00 2001
From: Arno Rehn <arno@arnorehn.de>
Date: Sun, 5 Oct 2025 17:43:14 +0200
Subject: [PATCH] Don't switch to global DMs when space contains DM

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

diff --git a/src/app/roommanager.cpp b/src/app/roommanager.cpp
index a6351fb3d..ee959d086 100644
--- 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;