If entering a conference with the 'w' option ensure that we can't listen or speak...

(closes issue #11835)
Reported by: alanmcmillan

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@103324 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 9ab8db54e19dd5a10d4194759464a6d117bec94f..ad547e509941ba39992a8a41961306a7cd6263ca 100644 (file)
--- 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;