[Asterisk-cvs] asterisk/apps app_meetme.c,1.39,1.40

[markster at lists.digium.com]

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

Modified Files:
	app_meetme.c 
Log Message:
Minor meetme cleanups


Index: app_meetme.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_meetme.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- app_meetme.c	9 Jun 2004 01:45:07 -0000	1.39
+++ app_meetme.c	9 Jun 2004 19:43:23 -0000	1.40
@@ -763,12 +763,13 @@
 
 		if (c) {
 			if (c->fds[0] != origfd) {
-				if (retryzap) {
+				if (using_pseudo) {
 					/* Kill old pseudo */
 					close(fd);
 				}
 				ast_log(LOG_DEBUG, "Ooh, something swapped out under us, starting over\n");
 				retryzap = 0;
+				using_pseudo = 0;
 				goto zapretry;
 			}
 			f = ast_read(c);
@@ -876,7 +877,7 @@
 						if (musiconhold) {
 				   			ast_moh_start(chan, NULL);
 						}
-			} else if (fd != chan->fds[0]) {
+			} else if (using_pseudo) {
 				if (f->frametype == AST_FRAME_VOICE) {
 					if (f->subclass == AST_FORMAT_ULAW) {
 						/* Carefully write */