From 446d1eee3e6090409109075ea41b5784b23801c9 Mon Sep 17 00:00:00 2001
From: Mark Spencer <markster@digium.com>
Date: Sun, 25 Sep 2005 03:57:53 +0000
Subject: [PATCH] Fix meet me / local channel (bug #5274)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6642 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
apps/app_meetme.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index fd766cebb3..77a2a406bf 100755
--- 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);
--
GitLab