[Asterisk-cvs] asterisk/apps app_meetme.c,1.110,1.111

[markster]

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

Modified Files:
	app_meetme.c 
Log Message:
Fix meet me / local channel (bug #5274)


Index: app_meetme.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_meetme.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- app_meetme.c	14 Sep 2005 20:46:49 -0000	1.110
+++ app_meetme.c	25 Sep 2005 03:57:53 -0000	1.111
@@ -936,7 +936,7 @@
 	}
 	ast_indicate(chan, -1);
 	retryzap = strcasecmp(chan->type, "Zap");
-	user->zapchannel = !strcasecmp(chan->type, "Zap");
+	user->zapchannel = !retryzap;
 zapretry:
 	origfd = chan->fds[0];
 	if (retryzap) {
@@ -1228,10 +1228,11 @@
 					if (using_pseudo) {
 						/* Kill old pseudo */
 						close(fd);
+						using_pseudo = 0;
 					}
 					ast_log(LOG_DEBUG, "Ooh, something swapped out under us, starting over\n");
-					retryzap = 0;
-					using_pseudo = 0;
+					retryzap = strcasecmp(c->type, "Zap");
+					user->zapchannel = !retryzap;
 					goto zapretry;
 				}
 				f = ast_read(c);