[asterisk-commits] rmudgett: trunk r316832 - in /trunk: ./ apps/app_meetme.c
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Wed May 4 13:57:07 CDT 2011
Author: rmudgett
Date: Wed May 4 13:57:02 2011
New Revision: 316832
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=316832
Log:
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
........
Modified:
trunk/ (props changed)
trunk/apps/app_meetme.c
Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.
Modified: trunk/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_meetme.c?view=diff&rev=316832&r1=316831&r2=316832
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Wed May 4 13:57:02 2011
@@ -2733,7 +2733,7 @@
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;
More information about the asterisk-commits
mailing list