diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-02-11 22:09:07 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-02-11 22:09:07 +0000 |
| commit | 57a8bf71df026da24ba3368ed53a71d763c122bc (patch) | |
| tree | c1a273d52f2ceed32fbaf66768490f0819b366f5 /apps | |
| parent | 217d4f14909538140bb7240f6c61009d366a6ebc (diff) | |
If entering a conference with the 'w' option ensure that we can't listen or speak until the marked user appears.
(closes issue #11835)
Reported by: alanmcmillan
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@103324 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_meetme.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 9ab8db54e..ad547e509 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -1658,7 +1658,9 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c } } - if (confflags & CONFFLAG_MONITOR) + if (confflags & CONFFLAG_WAITMARKED) + ztc.confmode = ZT_CONF_CONF; + else if (confflags & CONFFLAG_MONITOR) ztc.confmode = ZT_CONF_CONFMON | ZT_CONF_LISTENER; else if (confflags & CONFFLAG_TALKER) ztc.confmode = ZT_CONF_CONF | ZT_CONF_TALKER; |