mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-07 10:28:32 +00:00
Don't play the enter sound twice when a person joins a conference after the leader has joined it. (issue #6138 reported by shanermn)
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@30373 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -1069,7 +1069,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
|
|||||||
if (!firstpass && !(confflags & CONFFLAG_MONITOR) && !(confflags & CONFFLAG_ADMIN)) {
|
if (!firstpass && !(confflags & CONFFLAG_MONITOR) && !(confflags & CONFFLAG_ADMIN)) {
|
||||||
firstpass = 1;
|
firstpass = 1;
|
||||||
if (!(confflags & CONFFLAG_QUIET))
|
if (!(confflags & CONFFLAG_QUIET))
|
||||||
if (!(confflags & CONFFLAG_WAITMARKED) || (conf->markedusers >= 1))
|
if (!(confflags & CONFFLAG_WAITMARKED) || ((confflags & CONFFLAG_MARKEDUSER) && (conf->markedusers >= 1)))
|
||||||
conf_play(chan, conf, ENTER);
|
conf_play(chan, conf, ENTER);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user