diff options
| author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-25 20:05:54 +0000 |
|---|---|---|
| committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-25 20:05:54 +0000 |
| commit | 60a38c5f4ac792dfe01aa8c0fdc46519b476de0f (patch) | |
| tree | bd003c3f3e5a7bf173deacc6093ad028c88114c4 /apps | |
| parent | ec6b2a4b3bafd8c865c1a0ec06a2dc7e4c5aef4b (diff) | |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@30385 f38db490-d61c-443f-a65b-d21fe96a405b
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 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); } |