Unverified Commit 7bf617d2 authored by Sébastien Blin's avatar Sébastien Blin
Browse files

newcallmodel: fix pause when adding someone to a conference in hold

Change-Id: I559e13a654f9f0461d2afc650875063c625dc1bb
parent 605461ff
......@@ -429,6 +429,8 @@ NewCallModel::joinCalls(const std::string& callIdA, const std::string& callIdB)
} else if (call1.type == call::Type::CONFERENCE || call2.type == call::Type::CONFERENCE) {
auto call = call1.type == call::Type::CONFERENCE ? callIdB : callIdA;
auto conf = call1.type == call::Type::CONFERENCE ? callIdA : callIdB;
// Unpause conference if conference was not active
CallManager::instance().unholdConference(conf.c_str());
auto accountCall = call1.type == call::Type::CONFERENCE ? accountIdCall2 : accountIdCall1;
bool joined = CallManager::instance().addParticipant(call.c_str(), conf.c_str());
if (!joined) {
......
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