[asterisk-commits] file: branch 1.6.0 r107639 - in /branches/1.6.0: ./ apps/app_meetme.c

[SVN commits to the Asterisk project]

Author: file
Date: Tue Mar 11 13:50:15 2008
New Revision: 107639

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

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_meetme.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_meetme.c?view=diff&rev=107639&r1=107638&r2=107639
==============================================================================
--- branches/1.6.0/apps/app_meetme.c (original)
+++ branches/1.6.0/apps/app_meetme.c Tue Mar 11 13:50:15 2008
@@ -1876,7 +1876,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;