From 125de6387e78cffed7e7b191bd65dfcc862965ce Mon Sep 17 00:00:00 2001
From: Ming Rui Zhang <mingrui.zhang@savoirfairelinux.com>
Date: Thu, 18 Mar 2021 15:14:47 -0400
Subject: [PATCH] conversationmodel: fix signal emission order to avoid crash
Gitlab: #461
Change-Id: Id5978de02b459c34bb79a87161026fdda3793d1d
---
src/conversationmodel.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/conversationmodel.cpp b/src/conversationmodel.cpp
index 129212d7..22bc17b2 100644
--- a/src/conversationmodel.cpp
+++ b/src/conversationmodel.cpp
@@ -1693,8 +1693,8 @@ ConversationModelPimpl::slotContactAdded(const QString& contactUri)
searchResults.erase(searchResults.begin() + i);
}
- emit linked.conversationReady(profileInfo.uri);
emit linked.modelChanged();
+ emit linked.conversationReady(profileInfo.uri);
}
void
@@ -1746,10 +1746,10 @@ ConversationModelPimpl::slotContactRemoved(const QString& uri)
}
auto& conversationUid = conversations[conversationIdx].uid;
conversations.erase(conversations.begin() + conversationIdx);
- emit linked.conversationRemoved(conversationUid);
invalidateModel();
emit linked.modelChanged();
+ emit linked.conversationRemoved(conversationUid);
}
void
--
GitLab