[svn-commits] file: branch 1.4 r107637 - /branches/1.4/apps/app_meetme.c

[SVN commits to the Digium repositories]

Author: file
Date: Tue Mar 11 13:47:33 2008
New Revision: 107637

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

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=107637&r1=107636&r2=107637
==============================================================================
--- branches/1.4/apps/app_meetme.c (original)
+++ branches/1.4/apps/app_meetme.c Tue Mar 11 13:47:33 2008
@@ -1658,7 +1658,7 @@
 		}
 	}
 
-	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;