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

Fix crashes when logging out of connection

Browse Source
This commit is contained in:
Tobias Fella
2024-07-06 19:44:00 +02:00
parent 9e6c00f78c
commit bec1ad7bee
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/models/roomtreemodel.cpp
View File

@@ -221,6 +221,10 @@ int RoomTreeModel::rowCount(const QModelIndex &parent) const
parentItem = static_cast<RoomTreeItem *>(parent.internalPointer()); parentItem = static_cast<RoomTreeItem *>(parent.internalPointer());
} }
if (!parentItem) {
return 0;
}
return parentItem->childCount(); return parentItem->childCount();
} }

8
src/roommanager.cpp
View File

@@ -244,7 +244,9 @@ void RoomManager::loadInitialRoom()
void RoomManager::openRoomForActiveConnection() void RoomManager::openRoomForActiveConnection()
{ {
if (!m_connection) { if (!m_connection) {
m_currentRoom = nullptr; setCurrentRoom({});
setCurrentSpace({}, false);
return;
} }
const auto &lastRoom = m_lastRoomConfig.readEntry(m_connection->userId(), QString()); const auto &lastRoom = m_lastRoomConfig.readEntry(m_connection->userId(), QString());
if (lastRoom.isEmpty() || !m_connection->room(lastRoom)) { if (lastRoom.isEmpty() || !m_connection->room(lastRoom)) {
@@ -426,7 +428,9 @@ void RoomManager::setCurrentSpace(const QString &spaceId, bool setRoom)
m_sortFilterRoomTreeModel->setMode(m_currentSpaceId == QLatin1String("DM") ? SortFilterRoomTreeModel::DirectChats : SortFilterRoomTreeModel::Rooms); m_sortFilterRoomTreeModel->setMode(m_currentSpaceId == QLatin1String("DM") ? SortFilterRoomTreeModel::DirectChats : SortFilterRoomTreeModel::Rooms);
Q_EMIT currentSpaceChanged(); Q_EMIT currentSpaceChanged();
m_lastSpaceConfig.writeEntry(m_connection->userId(), spaceId); if (m_connection) {
m_lastSpaceConfig.writeEntry(m_connection->userId(), spaceId);
}
if (!setRoom) { if (!setRoom) {
return; return;