aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2007-11-01 13:27:37 +0000
committerfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2007-11-01 13:27:37 +0000
commitdb3962456cf3d23abc3ff97529ba8d569d63fc6d (patch)
tree687e3f4aada4b6bd6b61ff53e3e589e3618a5e66 /apps
parent0542866293bf0bead0f1c6e18704b2ae88563dd8 (diff)
Fix up commit for my Zap channel with spies in Meetme fix. (thanks Tony Mountifield!)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@88026 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rw-r--r--apps/app_meetme.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index f5aa159fb..411e1c349 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -1890,14 +1890,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->spies)) {
+ if (c->fds[0] != origfd || (user->zapchannel && c->spies)) {
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 = (strcasecmp(chan->tech->type, "Zap") || chan->spies ? 1 : 0);
+ retryzap = (strcasecmp(c->tech->type, "Zap") || c->spies ? 1 : 0);
user->zapchannel = !retryzap;
goto zapretry;
}