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

[markster at lists.digium.com]

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

Modified Files:
	app_meetme.c 
Log Message:
Cleanup side effect sof meetme changes (bug #3815)


Index: app_meetme.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_meetme.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- app_meetme.c	20 Mar 2005 18:02:45 -0000	1.89
+++ app_meetme.c	21 Mar 2005 02:06:58 -0000	1.90
@@ -964,7 +964,7 @@
 			}
 
 			/* trying to add moh for single person conf */
-			if ((confflags & CONFFLAG_MOH) && !( confflags & CONFFLAG_WAITMARKED)) {
+			if (confflags & CONFFLAG_MOH)  {
 				if (conf->users == 1) {
 					if (musiconhold == 0) {
 						ast_moh_start(chan, NULL);
@@ -979,7 +979,7 @@
 			}
 			
 			/* Leave if the last marked user left */
-			if (currentmarked == 0 && (confflags & CONFFLAG_MARKEDEXIT)) {
+			if (currentmarked == 0 && lastmarked != 0 && (confflags & CONFFLAG_MARKEDEXIT)) {
 				ret = -1;
 				break;
 			}