From: Joshua Colp <jcolp@digium.com>
Date: Tue, 11 Mar 2008 18:47:33 +0000 (+0000)
Subject: Add an additional check for setting conference parameter when using the marked user... 
X-Git-Tag: 1.4.19-rc3~33
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d9e83f85a6c990dc9a3eb47bcc46a4d613d76646;p=thirdparty%2Fasterisk.git

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.4@107637 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index e079898ea6..9dbdea821f 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;