[Asterisk-cvs] asterisk/apps app_meetme.c,1.31,1.32

[markster at lists.digium.com]

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

Modified Files:
	app_meetme.c 
Log Message:
Minor RTP video fixes, be more careful about closing fd's in meetme (bug #1743)


Index: app_meetme.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_meetme.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- app_meetme.c	27 May 2004 16:14:46 -0000	1.31
+++ app_meetme.c	30 May 2004 20:24:48 -0000	1.32
@@ -465,7 +465,8 @@
 	int firstpass = 0;
 	int ret = -1;
 	int x;
-        int menu_active = 0;
+	int menu_active = 0;
+	int using_pseudo = 0;
 
 	struct ast_app *app;
 	char *agifile;
@@ -561,6 +562,7 @@
 			ast_log(LOG_WARNING, "Unable to open pseudo channel: %s\n", strerror(errno));
 			goto outrun;
 		}
+		using_pseudo = 1;
 		/* Make non-blocking */
 		flags = fcntl(fd, F_GETFL);
 		if (flags < 0) {
@@ -885,7 +887,7 @@
 		}
 	}
 	}
-	if (fd != chan->fds[0])
+	if (using_pseudo)
 		close(fd);
 	else {
 		/* Take out of conference */