kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 04:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 30373 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r30373 | file | 2006-05-25 17:03:11 -0300 (Thu, 25 May 2006) | 2 lines

Don't play the enter sound twice when a person joins a conference after the leader has joined it. (issue #6138 reported by shanermn)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@30384 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2006-05-25 20:05:52 +00:00
parent 35fa97d1d5
commit 16d0f580f9
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/app_meetme.c
View File

@@ -1145,7 +1145,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
if (!firstpass && !(confflags & CONFFLAG_MONITOR) && !(confflags & CONFFLAG_ADMIN)) {
firstpass = 1;
if (!(confflags & CONFFLAG_QUIET))
if (!(confflags & CONFFLAG_WAITMARKED) || (conf->markedusers >= 1))
if (!(confflags & CONFFLAG_WAITMARKED) || ((confflags & CONFFLAG_MARKEDUSER) && (conf->markedusers >= 1)))
conf_play(chan, conf, ENTER);
}