[Asterisk-cvs] asterisk/apps app_meetme.c,1.84,1.85

[markster at lists.digium.com]

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

Modified Files:
	app_meetme.c 
Log Message:
Fix meetme flushing stupidity (doh!) (bug #3599)


Index: app_meetme.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_meetme.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- app_meetme.c	3 Mar 2005 23:33:11 -0000	1.84
+++ app_meetme.c	5 Mar 2005 15:25:08 -0000	1.85
@@ -540,10 +540,8 @@
 {
 	int x;
 	x = ZT_FLUSH_ALL;
-	if (ioctl(fd, ZT_FLUSH, x)) {
+	if (ioctl(fd, ZT_FLUSH, &x))
 		ast_log(LOG_WARNING, "Error flushing channel\n");
-		close(fd);
-	}
 }
 
 static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int confflags)
@@ -795,7 +793,6 @@
 		ast_mutex_unlock(&conflock);
 		goto outrun;
 	}
-	conf_flush(fd);
 	ast_log(LOG_DEBUG, "Placed channel %s in ZAP conf %d\n", chan->name, conf->zapconf);
 
 	manager_event(EVENT_FLAG_CALL, "MeetmeJoin", 
@@ -810,6 +807,7 @@
 		if (!(confflags & CONFFLAG_QUIET))
 			conf_play(chan, conf, ENTER);
 	}
+	conf_flush(fd);
 	ast_mutex_unlock(&conflock);
 	if (confflags & CONFFLAG_AGI) {