From 16d0f580f90c310de0a61aa328ba9219b93bf66c Mon Sep 17 00:00:00 2001
From: Joshua Colp <jcolp@digium.com>
Date: Thu, 25 May 2006 20:05:52 +0000
Subject: [PATCH] Merged revisions 30373 via svnmerge from
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
---
apps/app_meetme.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 3dd7a97ec9..b1385bedc7 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -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);
}
--
GitLab