From 6daf7bed0af3aa97c656475602c2b61d51ae6a97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Tue, 16 Nov 2021 10:39:54 -0500
Subject: [PATCH] manager: call processRemaining on hangupConference
hangupCall already call exitConference
Change-Id: I0666525045101974056ccea6fb07963caf04c6db
---
src/call.cpp | 2 +-
src/manager.cpp | 7 +------
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/src/call.cpp b/src/call.cpp
index 27a88efbd9..4ccf4a00df 100644
--- a/src/call.cpp
+++ b/src/call.cpp
@@ -267,7 +267,7 @@ Call::setState(CallState call_state, ConnectionState cnx_state, signed code)
connectionState_ = cnx_state;
auto new_client_state = getStateStr();
- for (auto it = stateChangedListeners_.begin(); it != stateChangedListeners_.end(); ) {
+ for (auto it = stateChangedListeners_.begin(); it != stateChangedListeners_.end();) {
if ((*it)(callState_, connectionState_, code))
++it;
else
diff --git a/src/manager.cpp b/src/manager.cpp
index 74735b7843..c727785750 100644
--- a/src/manager.cpp
+++ b/src/manager.cpp
@@ -1270,13 +1270,8 @@ Manager::hangupConference(const std::string& id)
JAMI_DBG("Hangup conference %s", id.c_str());
if (auto conf = getConferenceFromID(id)) {
ParticipantSet participants(conf->getParticipantList());
- for (const auto& callId : participants) {
- if (auto call = getCallFromCallID(callId)) {
- call->resetConfInfo();
- call->exitConference();
- }
+ for (const auto& callId : participants)
hangupCall(callId);
- }
pimpl_->unsetCurrentCall();
return true;
}
--
GitLab