mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-22 13:25:17 +00:00
Fix up commit for my Zap channel with spies in Meetme fix. (thanks Tony Mountifield!)
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@88026 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -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;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user