From a45d2f29c64b7c01401c91a3cb5717c0d320f6b5 Mon Sep 17 00:00:00 2001
From: Richard Mudgett <rmudgett@digium.com>
Date: Wed, 4 May 2011 18:57:02 +0000
Subject: [PATCH] Merged revisions 316831 via svnmerge from
 https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r316831 | rmudgett | 2011-05-04 13:51:40 -0500 (Wed, 04 May 2011) | 9 lines

  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/trunk@316832 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 apps/app_meetme.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index b9f0dbbff1..73d97167f6 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -2733,7 +2733,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;
-- 
GitLab