From 9ef31203c98aafa11cb21532d95fa7d8adbaf763 Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Thu, 25 May 2006 20:03:11 +0000 Subject: [PATCH] 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/branches/1.2@30373 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 a4d82eb384..69996c8f70 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -1069,7 +1069,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); } -- 2.47.2