From: Joshua Colp <jcolp@digium.com>
Date: Mon, 11 Feb 2008 22:10:55 +0000 (+0000)
Subject: Merged revisions 103324 via svnmerge from
X-Git-Tag: 1.6.0-beta3~2^2~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f99a1b4bf1fa569c9a0c201a327508eb9ad94a4;p=thirdparty%2Fasterisk.git

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
---

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 3cc5b551e0..41c9950096 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;