Skip to content
Snippets Groups Projects
Commit 76de469a authored by Alexandre Savard's avatar Alexandre Savard
Browse files

#10736: do not use iterator in daemon when joining conferences

parent 3d865db4
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
daemon/src/managerimpl.cpp
+ 6
− 8
View file @ 76de469a
...@@ -1156,8 +1156,7 @@ void ManagerImpl::joinConference(const std::string& conf_id1, ...@@ -1156,8 +1156,7 @@ void ManagerImpl::joinConference(const std::string& conf_id1,
return; return;
} }
if (iter->second) { Conference *conf = conferenceMap_.find(conf_id1)->second;
Conference *conf = iter->second;
ParticipantSet participants(conf->getParticipantList()); ParticipantSet participants(conf->getParticipantList());
for (ParticipantSet::const_iterator p = participants.begin(); for (ParticipantSet::const_iterator p = participants.begin();
...@@ -1166,7 +1165,6 @@ void ManagerImpl::joinConference(const std::string& conf_id1, ...@@ -1166,7 +1165,6 @@ void ManagerImpl::joinConference(const std::string& conf_id1,
addParticipant(*p, conf_id2); addParticipant(*p, conf_id2);
} }
} }
}
void ManagerImpl::addStream(const std::string& call_id) void ManagerImpl::addStream(const std::string& call_id)
{ {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment