diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-25 20:03:11 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-25 20:03:11 +0000 |
| commit | 4eb8ce8704c777825ae9febc5ea60e6d860d31f1 (patch) | |
| tree | 77cfb2c0154fc7928e6c8a478c8e6ee74218d527 | |
| parent | 229b8e4408761367642aa1144da784980c0a535f (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.2@30373 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | apps/app_meetme.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index a4d82eb38..69996c8f7 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -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)) { firstpass = 1; 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); } |