diff options
| author | Joshua Colp <jcolp@digium.com> | 2006-05-25 20:05:52 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2006-05-25 20:05:52 +0000 |
| commit | 16d0f580f90c310de0a61aa328ba9219b93bf66c (patch) | |
| tree | 696917a8e2887cc200fc9479457f5d363368b878 /apps | |
| parent | 35fa97d1d5502c22618ec22daf7cf12364815d9f (diff) | |
Merged revisions 30373 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r30373 | file | 2006-05-25 17:03:11 -0300 (Thu, 25 May 2006) | 2 lines
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/trunk@30384 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
| -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 3dd7a97ec..b1385bedc 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -1145,7 +1145,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); } |