From: Richard Mudgett <rmudgett@digium.com>
Date: Wed, 4 May 2011 18:51:40 +0000 (+0000)
Subject: Wait for leader with Music On Hold allows crosstalk between participants.
X-Git-Tag: 1.8.5-rc1~11^2~171
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63579a892c1ae761e5b8cd90f7f797e3020f3663;p=thirdparty%2Fasterisk.git

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@316831 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 92d8d9944a..7a582fc4f3 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -2658,7 +2658,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc
 		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;