[Asterisk-cvs] asterisk/apps app_meetme.c,1.90,1.91

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv1759/apps

Modified Files:
	app_meetme.c 
Log Message:
Revert broken portion of 3815 (bug #3816)


Index: app_meetme.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_meetme.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- app_meetme.c	21 Mar 2005 02:06:58 -0000	1.90
+++ app_meetme.c	21 Mar 2005 03:23:05 -0000	1.91
@@ -964,7 +964,7 @@
 			}
 
 			/* trying to add moh for single person conf */
-			if (confflags & CONFFLAG_MOH)  {
+			if ((confflags & CONFFLAG_MOH) && !(confflags & CONFFLAG_WAITMARKED)) {
 				if (conf->users == 1) {
 					if (musiconhold == 0) {
 						ast_moh_start(chan, NULL);