[svn-commits] branch jcollie/bug7131 r30389 - in /team/jcollie/bug7131: ./ apps/app_meetme.c

[svn-commits at lists.digium.com]

Author: jcollie
Date: Thu May 25 15:49:16 2006
New Revision: 30389

URL: http://svn.digium.com/view/asterisk?rev=30389&view=rev
Log:
Merged revisions 30384 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r30384 | file | 2006-05-25 15:05:52 -0500 (Thu, 25 May 2006) | 10 lines

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)

........

................

Modified:
    team/jcollie/bug7131/   (props changed)
    team/jcollie/bug7131/apps/app_meetme.c

Propchange: team/jcollie/bug7131/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: team/jcollie/bug7131/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu May 25 15:49:16 2006
@@ -1,1 +1,1 @@
-/trunk:1-30375
+/trunk:1-30388

Modified: team/jcollie/bug7131/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug7131/apps/app_meetme.c?rev=30389&r1=30388&r2=30389&view=diff
==============================================================================
--- team/jcollie/bug7131/apps/app_meetme.c (original)
+++ team/jcollie/bug7131/apps/app_meetme.c Thu May 25 15:49:16 2006
@@ -1145,7 +1145,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);
 	}