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

Don't crash when leaving an opened room

Browse Source 
Should fix #568
This commit is contained in:
Tobias Fella
2023-01-28 20:23:10 +01:00
parent 9d5303113e
commit ebd521e2ee
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/chatdocumenthandler.cpp
View File

@@ -105,7 +105,7 @@ ChatDocumentHandler::ChatDocumentHandler(QObject *parent)
{ {
connect(this, &ChatDocumentHandler::roomChanged, this, [this]() { connect(this, &ChatDocumentHandler::roomChanged, this, [this]() {
m_completionModel->setRoom(m_room); m_completionModel->setRoom(m_room);
static NeoChatRoom *previousRoom = nullptr; static QPointer<NeoChatRoom> previousRoom = nullptr;
if (previousRoom) { if (previousRoom) {
disconnect(previousRoom, &NeoChatRoom::chatBoxTextChanged, this, nullptr); disconnect(previousRoom, &NeoChatRoom::chatBoxTextChanged, this, nullptr);
} }

3
src/models/userlistmodel.h
View File

@@ -7,6 +7,7 @@
#include <QAbstractListModel> #include <QAbstractListModel>
#include <QObject> #include <QObject>
#include <QPointer>
class NeoChatRoom; class NeoChatRoom;
@@ -70,7 +71,7 @@ private Q_SLOTS:
void avatarChanged(Quotient::User *user, const Quotient::Room *context); void avatarChanged(Quotient::User *user, const Quotient::Room *context);
private: private:
NeoChatRoom *m_currentRoom; QPointer<NeoChatRoom> m_currentRoom;
QList<Quotient::User *> m_users; QList<Quotient::User *> m_users;
int findUserPos(Quotient::User *user) const; int findUserPos(Quotient::User *user) const;