diff options
| author | Joshua Colp <jcolp@digium.com> | 2008-02-11 22:10:55 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2008-02-11 22:10:55 +0000 |
| commit | 3f99a1b4bf1fa569c9a0c201a327508eb9ad94a4 (patch) | |
| tree | 1c107778539968fa8874ab9f6b45671a0abf8953 /apps/app_meetme.c | |
| parent | cc0c25c76c84790b8ac3a9ad8cfab32abfc39346 (diff) | |
Merged revisions 103324 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r103324 | file | 2008-02-11 18:09:07 -0400 (Mon, 11 Feb 2008) | 4 lines
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: https://origsvn.digium.com/svn/asterisk/trunk@103325 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_meetme.c')
| -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 3cc5b551e..41c995009 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -1876,7 +1876,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; |