From c39026c4b5e44d230b03f2a5f48e42cebae3b513 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Blin?= <sebastien.blin@savoirfairelinux.com> Date: Wed, 11 Mar 2020 14:04:58 -0400 Subject: [PATCH] connectionmanager: call pending callbacks before erase pending connection This avoid to lock a pending request Change-Id: Id73cf58fd1434a898e28b52296a0bd4a9f6b7ea0 Gitlab: #209 --- src/jamidht/connectionmanager.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/jamidht/connectionmanager.cpp b/src/jamidht/connectionmanager.cpp index d895bb7ab4..db53faa503 100644 --- a/src/jamidht/connectionmanager.cpp +++ b/src/jamidht/connectionmanager.cpp @@ -710,6 +710,7 @@ ConnectionManager::closeConnectionsWith(const std::string& deviceId) auto it = pimpl_->pendingCbs_.begin(); while (it != pimpl_->pendingCbs_.end()) { if (it->first.first == deviceId) { + if (it->second) it->second(nullptr); it = pimpl_->pendingCbs_.erase(it); } else { ++it; -- GitLab