[svn-commits] branch 1.2 r30373 - /branches/1.2/apps/app_meetme.c

[svn-commits at lists.digium.com]

Author: file
Date: Thu May 25 15:03:11 2006
New Revision: 30373

URL: http://svn.digium.com/view/asterisk?rev=30373&view=rev
Log:
Don't play the enter sound twice when a person joins a conference after the leader has joined it. (issue #6138 reported by shanermn)

Modified:
    branches/1.2/apps/app_meetme.c

Modified: branches/1.2/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/branches/1.2/apps/app_meetme.c?rev=30373&r1=30372&r2=30373&view=diff
==============================================================================
--- branches/1.2/apps/app_meetme.c (original)
+++ branches/1.2/apps/app_meetme.c Thu May 25 15:03:11 2006
@@ -1069,7 +1069,7 @@
 	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);
 	}