Fix meet me / local channel (bug #5274)

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

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index fd766cebb379db1b3fdbb536ac199221f38e94da..77a2a406bfc2507c822bc6c0945a28ef38331691 100755 (executable)
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -936,7 +936,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
        }
        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 @@ zapretry:
                                        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);