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

manager: call processRemaining on hangupConference

Browse Source 
hangupCall already call exitConference

Change-Id: I0666525045101974056ccea6fb07963caf04c6db
This commit is contained in:
Sébastien Blin
2021-11-16 10:39:54 -05:00
committed by Adrien Béraud
parent 50a7e128f8
commit 6daf7bed0a
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/call.cpp
View File

@ -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

7
src/manager.cpp
View File

@ -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;
}