[asterisk-commits] rmudgett: branch 1.8 r316831 - /branches/1.8/apps/app_meetme.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Wed May  4 13:51:40 2011
New Revision: 316831

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=316831
Log:
Wait for leader with Music On Hold allows crosstalk between participants.

Parenthesis in the wrong position.  Regression from issue #14365 when
expanding conference flags to use 64 bits.

(closes issue #18418)
Reported by: MrHanMan
Tested by: rmudgett

Modified:
    branches/1.8/apps/app_meetme.c

Modified: branches/1.8/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/apps/app_meetme.c?view=diff&rev=316831&r1=316830&r2=316831
==============================================================================
--- branches/1.8/apps/app_meetme.c (original)
+++ branches/1.8/apps/app_meetme.c Wed May  4 13:51:40 2011
@@ -2658,7 +2658,7 @@
 		ao2_ref(item, -1);
 	}
 
-	if (ast_test_flag64(confflags, CONFFLAG_WAITMARKED && !conf->markedusers))
+	if (ast_test_flag64(confflags, CONFFLAG_WAITMARKED) && !conf->markedusers)
 		dahdic.confmode = DAHDI_CONF_CONF;
 	else if (ast_test_flag64(confflags, CONFFLAG_MONITOR))
 		dahdic.confmode = DAHDI_CONF_CONFMON | DAHDI_CONF_LISTENER;