Skip to content
Snippets Groups Projects
Commit 4ba50011 authored by Tristan Matthews's avatar Tristan Matthews
Browse files

Merge branch 'no_globals_in_calltree_experiment' of...

Merge branch 'no_globals_in_calltree_experiment' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into no_globals_in_calltree_experiment
parents 0183746e 3d865db4
No related branches found
No related tags found
No related merge requests found
...@@ -1144,14 +1144,14 @@ void ManagerImpl::processRemainingParticipants(const std::string &current_call_i ...@@ -1144,14 +1144,14 @@ void ManagerImpl::processRemainingParticipants(const std::string &current_call_i
void ManagerImpl::joinConference(const std::string& conf_id1, void ManagerImpl::joinConference(const std::string& conf_id1,
const std::string& conf_id2) 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()); ERROR("Not a valid conference ID: %s", conf_id1.c_str());
return; 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()); ERROR("Not a valid conference ID: %s", conf_id2.c_str());
return; return;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment