From 7bf617d228023f1aca0b4ceac068a34bedbceb72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Wed, 16 Oct 2019 17:18:45 -0400
Subject: [PATCH] newcallmodel: fix pause when adding someone to a conference
in hold
Change-Id: I559e13a654f9f0461d2afc650875063c625dc1bb
---
src/newcallmodel.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/newcallmodel.cpp b/src/newcallmodel.cpp
index c921d7d6..5c3d8a88 100644
--- a/src/newcallmodel.cpp
+++ b/src/newcallmodel.cpp
@@ -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) {
--
GitLab