ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix transitioning from invitation page to normal room page

Browse Source
This commit is contained in:
Tobias Fella
2024-10-10 22:03:30 +02:00
parent 9ef342e448
commit b5fdb3d0db
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/roommanager.cpp
View File

@@ -303,7 +303,8 @@ void RoomManager::visitRoom(Room *r, const QString &eventId)
return; return;
} }
if (m_currentRoom && m_currentRoom->id() == room->id()) { // It's important that we compare room *objects* here, not just room *ids*, since we need to deal with the object changing when going invite -> joined
if (m_currentRoom && m_currentRoom == room) {
Q_EMIT goToEvent(eventId); Q_EMIT goToEvent(eventId);
} else { } else {
setCurrentRoom(room->id()); setCurrentRoom(room->id());
@@ -437,6 +438,11 @@ void RoomManager::setConnection(NeoChatConnection *connection)
connect(m_connection, &NeoChatConnection::directChatAvailable, this, [this](Quotient::Room *directChat) { connect(m_connection, &NeoChatConnection::directChatAvailable, this, [this](Quotient::Room *directChat) {
resolveResource(directChat->id()); resolveResource(directChat->id());
}); });
connect(m_connection, &NeoChatConnection::joinedRoom, this, [this](const auto &room, const auto &previousRoom) {
if (m_currentRoom == previousRoom) {
resolveResource(room->id());
}
});
} }
Q_EMIT connectionChanged(); Q_EMIT connectionChanged();