diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-01 13:30:28 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-01 13:30:28 +0000 |
| commit | 9efed809d4b3787aa2b7f824d0c0b56221e49b75 (patch) | |
| tree | 7f9577b6d2331b35596ce0143eb658d014e3546d /apps/app_meetme.c | |
| parent | 0ef4927a345c7c0a6a28e4d81fe27de89c138c2a (diff) | |
Merged revisions 88026 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r88026 | file | 2007-11-01 10:27:37 -0300 (Thu, 01 Nov 2007) | 2 lines
Fix up commit for my Zap channel with spies in Meetme fix. (thanks Tony Mountifield!)
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@88027 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_meetme.c')
| -rw-r--r-- | apps/app_meetme.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 1676b6d29..bb3c1e9fb 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -2039,14 +2039,14 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c break; if (c) { - if (c->fds[0] != origfd || (user->zapchannel && chan->audiohooks)) { + if (c->fds[0] != origfd || (user->zapchannel && c->audiohooks)) { if (using_pseudo) { /* Kill old pseudo */ close(fd); using_pseudo = 0; } ast_debug(1, "Ooh, something swapped out under us, starting over\n"); - retryzap = (strcasecmp(chan->tech->type, "Zap") || chan->audiohooks ? 1 : 0); + retryzap = (strcasecmp(c->tech->type, "Zap") || c->audiohooks ? 1 : 0); user->zapchannel = !retryzap; goto zapretry; } |