Fix segfault when leaving certain rooms.

2018-11-07 16:29:24 +08:00
parent 6e44347efd
commit 06983a506c
12 changed files with 74 additions and 86 deletions
--- a/src/userlistmodel.cpp
+++ b/src/userlistmodel.cpp
@@ -18,9 +18,9 @@ void UserListModel::setRoom(QMatrixClient::Room* room) {

  using namespace QMatrixClient;
  beginResetModel();
-  if (m_currentRoom && m_currentRoom->connection()) {
-    m_currentRoom->connection()->disconnect(this);
+  if (m_currentRoom) {
    m_currentRoom->disconnect(this);
+//    m_currentRoom->connection()->disconnect(this);
    for (User* user : m_users) user->disconnect(this);
    m_users.clear();
  }