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

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index b9f0dbb..73d9716 100644 (file)
--- 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;