From 62fe7c866a54b042323ba8af4079caa32df0dc96 Mon Sep 17 00:00:00 2001 From: Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com> Date: Thu, 10 Apr 2025 11:42:54 -0400 Subject: [PATCH] conversation: skip loading if conversation Id is empty When loading from the notification extension, check if the conversation Id is empty. This can happen when cloning a conversation or during resubscribe. In such cases, we only need to start the account. Change-Id: Ia59b88cbf00a594621b61a1d534b18cb3805c827 --- src/manager.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/manager.cpp b/src/manager.cpp index e0e7dcecb8..40e59764bc 100644 --- a/src/manager.cpp +++ b/src/manager.cpp @@ -3049,6 +3049,11 @@ Manager::loadAccountAndConversation(const std::string& accountId, JAMI_WARN("Unable to load account %s", accountId.c_str()); return; } + + if (convId.empty() && !loadAll) { + // Nothing to load. Only need to start account + return; + } if (auto jamiAcc = std::dynamic_pointer_cast<JamiAccount>(account)) { jamiAcc->setActive(true); jamiAcc->reloadContacts(); -- GitLab