|
|
@ -1890,14 +1890,14 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
if (c) {
|
|
|
|
if (c) {
|
|
|
|
if (c->fds[0] != origfd || (user->zapchannel && chan->spies)) {
|
|
|
|
if (c->fds[0] != origfd || (user->zapchannel && c->spies)) {
|
|
|
|
if (using_pseudo) {
|
|
|
|
if (using_pseudo) {
|
|
|
|
/* Kill old pseudo */
|
|
|
|
/* Kill old pseudo */
|
|
|
|
close(fd);
|
|
|
|
close(fd);
|
|
|
|
using_pseudo = 0;
|
|
|
|
using_pseudo = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
ast_log(LOG_DEBUG, "Ooh, something swapped out under us, starting over\n");
|
|
|
|
ast_log(LOG_DEBUG, "Ooh, something swapped out under us, starting over\n");
|
|
|
|
retryzap = (strcasecmp(chan->tech->type, "Zap") || chan->spies ? 1 : 0);
|
|
|
|
retryzap = (strcasecmp(c->tech->type, "Zap") || c->spies ? 1 : 0);
|
|
|
|
user->zapchannel = !retryzap;
|
|
|
|
user->zapchannel = !retryzap;
|
|
|
|
goto zapretry;
|
|
|
|
goto zapretry;
|
|
|
|
}
|
|
|
|
}
|
|
|
|