Fix meet me / local channel (bug #5274)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6642 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
05b9e2fd84
commit
5d083c4a80
|
@ -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);
|
||||
|
|
Reference in New Issue