diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-11 18:47:33 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-11 18:47:33 +0000 |
| commit | 4456baa370f17514f52c10fe1a97f17eee588613 (patch) | |
| tree | 46b8d2819259ee9ac1187eebb7c2527c7a5028f0 /apps | |
| parent | 2e351a03d74b3051aa46f8d830d408c8c3dfe0b1 (diff) | |
Add an additional check for setting conference parameter when using the marked user options. It was possible for it to return to a no listen/no talk state if a masquerade happened.
(closes issue #12136)
Reported by: aragon
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@107637 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 e079898ea..9dbdea821 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -1658,7 +1658,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c } } - if (confflags & CONFFLAG_WAITMARKED) + if (confflags & CONFFLAG_WAITMARKED && !conf->markedusers) ztc.confmode = ZT_CONF_CONF; else if (confflags & CONFFLAG_MONITOR) ztc.confmode = ZT_CONF_CONFMON | ZT_CONF_LISTENER; |