From 4000d4e02924621a6491a523f5b9fc3aea8fca56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Tue, 19 Jul 2022 16:01:46 -0400
Subject: [PATCH] contacts: allow converting existing contact to swarm
Change-Id: Id4c741ebfa9a7c731ad32db0267a66b755896166
---
src/jamidht/contact_list.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/jamidht/contact_list.cpp b/src/jamidht/contact_list.cpp
index 6a0d250b1b..49328d3a28 100644
--- a/src/jamidht/contact_list.cpp
+++ b/src/jamidht/contact_list.cpp
@@ -78,7 +78,7 @@ ContactList::addContact(const dht::InfoHash& h, bool confirmed, const std::strin
auto c = contacts_.find(h);
if (c == contacts_.end())
c = contacts_.emplace(h, Contact {}).first;
- else if (c->second.isActive() and c->second.confirmed == confirmed)
+ else if (c->second.isActive() and c->second.confirmed == confirmed && c->second.conversationId == conversationId)
return false;
c->second.added = std::time(nullptr);
// NOTE: because we can re-add a contact after removing it
--
GitLab