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 84f2e1081e7e1548dfd864763ed1d5b40eb3170b..271d4b5a7e1d3545d378b966912e32f3fc129d74 100755 (executable)
--- 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 */