[asterisk-commits] file: branch 1.4 r103324 - /branches/1.4/apps/app_meetme.c

[SVN commits to the Asterisk project]

Author: file
Date: Mon Feb 11 16:09:07 2008
New Revision: 103324

URL: http://svn.digium.com/view/asterisk?view=rev&rev=103324
Log:
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

Modified:
    branches/1.4/apps/app_meetme.c

Modified: branches/1.4/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/apps/app_meetme.c?view=diff&rev=103324&r1=103323&r2=103324
==============================================================================
--- branches/1.4/apps/app_meetme.c (original)
+++ branches/1.4/apps/app_meetme.c Mon Feb 11 16:09:07 2008
@@ -1658,7 +1658,9 @@
 		}
 	}
 
-	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;