[Asterisk-cvs] asterisk/apps app_meetme.c,1.76,1.77

markster at lists.digium.com markster at lists.digium.com
Tue Feb 1 14:04:13 CST 2005


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

Modified Files:
	app_meetme.c 
Log Message:
Fix proper cleanup (bug #3481)


Index: app_meetme.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_meetme.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- app_meetme.c	1 Feb 2005 06:48:50 -0000	1.76
+++ app_meetme.c	1 Feb 2005 20:05:30 -0000	1.77
@@ -1108,14 +1108,15 @@
 	if (!(confflags & CONFFLAG_QUIET) && !(confflags & CONFFLAG_MONITOR) && !(confflags & CONFFLAG_ADMIN))
 		conf_play(conf, LEAVE);
 
-	if (!(confflags & CONFFLAG_QUIET) && (confflags & CONFFLAG_INTROUSER) && conf->users > 1) {
-		if (conf->chan && ast_fileexists(user->namerecloc, NULL, NULL)) {
-			if (!ast_streamfile(conf->chan, user->namerecloc, chan->language))
-				ast_waitstream(conf->chan, "");
-			if (!ast_streamfile(conf->chan, "conf-hasleft", chan->language))
-				ast_waitstream(conf->chan, "");
+	if (!(confflags & CONFFLAG_QUIET) && (confflags & CONFFLAG_INTROUSER)) {
+		if (ast_fileexists(user->namerecloc, NULL, NULL)) {
+			if ((conf->chan) && (conf->users > 1)) {
+				if (!ast_streamfile(conf->chan, user->namerecloc, chan->language))
+					ast_waitstream(conf->chan, "");
+				if (!ast_streamfile(conf->chan, "conf-hasleft", chan->language))
+					ast_waitstream(conf->chan, "");
+			}
 			ast_filedelete(user->namerecloc, NULL);
-
 		}
 	}
 	ast_mutex_unlock(&conflock);




More information about the svn-commits mailing list