dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

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: http://svn.digium.com/svn/asterisk/trunk@316832 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
rmudgett 2011-05-04 18:57:02 +00:00
parent a39db8cd5d
commit 4a6f8b3b54
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/app_meetme.c
View File

@ -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;