From 2e3659d4eedb0f573330e88e3e675bedbe2733a3 Mon Sep 17 00:00:00 2001 From: James Graham Date: Sun, 24 Nov 2024 13:13:47 +0000 Subject: [PATCH] Don't open the space home page when changing spaces on android When I change space on android I just want to be able to select a room I'm in. --- src/qml/SpaceDrawer.qml | 1 - src/roommanager.cpp | 10 ++++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/qml/SpaceDrawer.qml b/src/qml/SpaceDrawer.qml index 2020c629c..f7cd05f94 100644 --- a/src/qml/SpaceDrawer.qml +++ b/src/qml/SpaceDrawer.qml @@ -200,7 +200,6 @@ QQC2.Control { activeFocusOnTab: true onSelected: { - RoomManager.resolveResource(spaceDelegate.roomId); RoomManager.currentSpace = spaceDelegate.roomId; } checked: RoomManager.currentSpace === roomId diff --git a/src/roommanager.cpp b/src/roommanager.cpp index 4f3833081..9135f2b31 100644 --- a/src/roommanager.cpp +++ b/src/roommanager.cpp @@ -455,10 +455,12 @@ void RoomManager::setCurrentSpace(const QString &spaceId, bool setRoom) return; } - if (spaceId.length() > 3) { - resolveResource(spaceId, "no_join"_ls); - } else if (!m_isMobile) { - visitRoom({}, {}); + if (!m_isMobile) { + if (spaceId.length() > 3) { + resolveResource(spaceId, "no_join"_ls); + } else { + visitRoom({}, {}); + } } }