diff options
author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-09-25 03:57:53 +0000 |
---|---|---|
committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-09-25 03:57:53 +0000 |
commit | 5d083c4a80910d6900cd54942456d12296dbea04 (patch) | |
tree | 3e487efa29372829553e946ea60eed7d3ce7f033 | |
parent | 05b9e2fd84dd79ccb10724fb2ba640bf577482fb (diff) |
Fix meet me / local channel (bug #5274)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6642 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-x | apps/app_meetme.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index fd766cebb..77a2a406b 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); |