From 19d2815dcd4de62e66bc873ec0480892f45a8b98 Mon Sep 17 00:00:00 2001 From: Alexandre Savard <alexandre.savard@savoirfairelinux.com> Date: Tue, 15 May 2012 10:49:20 -0400 Subject: [PATCH] #10736: Fix joining conferences in daemon --- daemon/src/managerimpl.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/daemon/src/managerimpl.cpp b/daemon/src/managerimpl.cpp index 165f8e33d2..220cc9fed8 100644 --- a/daemon/src/managerimpl.cpp +++ b/daemon/src/managerimpl.cpp @@ -1144,14 +1144,14 @@ void ManagerImpl::processRemainingParticipants(const std::string ¤t_call_i void ManagerImpl::joinConference(const std::string& conf_id1, const std::string& conf_id2) { - ConferenceMap::iterator iter(conferenceMap_.find(conf_id1)); + DEBUG("Join conferences %s and %s", conf_id1.c_str(), conf_id2.c_str()); - if (iter == conferenceMap_.end()) { + if (conferenceMap_.find(conf_id1) == conferenceMap_.end()) { ERROR("Not a valid conference ID: %s", conf_id1.c_str()); return; } - if (conferenceMap_.find(conf_id2) != conferenceMap_.end()) { + if (conferenceMap_.find(conf_id2) == conferenceMap_.end()) { ERROR("Not a valid conference ID: %s", conf_id2.c_str()); return; } -- GitLab