From aad2069958bb7f62f16ce98b3ccdfc4bbec5617b Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Tue, 11 Mar 2008 18:50:15 +0000 Subject: [PATCH] Merged revisions 107638 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r107638 | file | 2008-03-11 15:48:59 -0300 (Tue, 11 Mar 2008) | 12 lines Merged revisions 107637 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r107637 | file | 2008-03-11 15:47:33 -0300 (Tue, 11 Mar 2008) | 4 lines 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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@107639 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_meetme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/app_meetme.c b/apps/app_meetme.c index a9ffb196d7..368cc4539d 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -1876,7 +1876,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;