jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

jamiaccount: avoid use after move

Browse Source 
Change-Id: Ie72b4c03bfe5d948a0aa8e48ae8a5d99f1650f42
This commit is contained in:
Sébastien Blin
2021-06-23 12:39:28 -04:00
parent f58ba79a4d
commit 062111c7c6
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/jamidht/jamiaccount.cpp
View File

@ -1206,10 +1206,11 @@ JamiAccount::loadAccount(const std::string& archive_password,
auto details = vCard::utils::toMap(
std::string_view(reinterpret_cast<const char*>(payload.data()), payload.size()));
req.metadatas = ConversationRepository::infosFromVCard(details);
auto reqMap = req.toMap();
accountManager_->addConversationRequest(conversationId, std::move(req));
emitSignal<DRing::ConversationSignal::ConversationRequestReceived>(getAccountID(),
conversationId,
req.toMap());
reqMap);
}
},
[this](const std::map<dht::InfoHash, KnownDevice>& devices) {
@ -4386,13 +4387,12 @@ JamiAccount::onConversationRequest(const std::string& from, const Json::Value& v
return;
}
req.received = std::time(nullptr);
auto reqMap = req.toMap();
accountManager_->addConversationRequest(convId, std::move(req));
// Note: no need to sync here because over connected devices should receives
// the same conversation request. Will sync when the conversation will be added
emitSignal<DRing::ConversationSignal::ConversationRequestReceived>(accountID_,
convId,
req.toMap());
emitSignal<DRing::ConversationSignal::ConversationRequestReceived>(accountID_, convId, reqMap);
}
void