mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-02 03:48:02 +00:00
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
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user