From: Mark Spencer <markster@digium.com>
Date: Wed, 9 Jun 2004 19:43:23 +0000 (+0000)
Subject: Minor meetme cleanups
X-Git-Tag: 1.0.0-rc1~275
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a53d260d5f6367cb6f3719ca6dfa9fe5b9b28040;p=thirdparty%2Fasterisk.git

Minor meetme cleanups


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3182 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 84f2e1081e..271d4b5a7e 100755
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -763,12 +763,13 @@ zapretry:
 
 		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 @@ zapretry:
 						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 */