Commit a98b6dfc authored by Adrien Béraud's avatar Adrien Béraud
Browse files

manager: detach conference instead of holding

Change-Id: I2bf4ba82b72963109f1ffc7f959fc928abb0bbe7
parent da914587
......@@ -1268,10 +1268,7 @@ bool
Manager::holdConference(const std::string& id)
{
if (auto conf = getConferenceFromID(id)) {
for (const auto &item : conf->getParticipantList())
onHoldCall(item);
conf->setState(Conference::State::HOLD);
conf->detach();
emitSignal<DRing::CallSignal::ConferenceChanged>(conf->getConfID(), conf->getStateStr());
return true;
}
......@@ -1292,6 +1289,8 @@ Manager::unHoldConference(const std::string& id)
conf->setState(Conference::State::ACTIVE_ATTACHED);
emitSignal<DRing::CallSignal::ConferenceChanged>(conf->getConfID(), conf->getStateStr());
return true;
} else if (conf->getState() == Conference::State::ACTIVE_DETACHED) {
pimpl_->addMainParticipant(*conf);
}
}
return false;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment