]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Wait for leader with Music On Hold allows crosstalk between participants.
authorRichard Mudgett <rmudgett@digium.com>
Wed, 4 May 2011 18:51:40 +0000 (18:51 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Wed, 4 May 2011 18:51:40 +0000 (18:51 +0000)
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

apps/app_meetme.c

index 92d8d9944aeac792c4df6c91d0572ef6bf40016a..7a582fc4f3c36a8757b6ce82bd6a07b3d69241ff 100644 (file)
@@ -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;