diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-01-09 16:11:17 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-01-09 16:11:17 +0000 |
| commit | 231c582d633493463cffa43c250b89eac3b3a580 (patch) | |
| tree | a991b0edaf264e8fe1bb8b4f6205be0a66f07d0c /apps/app_meetme.c | |
| parent | 11c7636e69daf4f8c648bc3013e6c53421ce2540 (diff) | |
Don't do conferencing totally in Zaptel if Monitor is running on the channel.
(closes issue #11709)
Reported by: BigJimmy
Patches:
patch-meetmerec uploaded by BigJimmy (license 371)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@97450 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_meetme.c')
| -rw-r--r-- | apps/app_meetme.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 84cd7978d..0c8842b8a 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -1578,7 +1578,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c goto outrun; } - retryzap = (strcasecmp(chan->tech->type, "Zap") || chan->spies ? 1 : 0); + retryzap = (strcasecmp(chan->tech->type, "Zap") || (chan->spies || chan->monitor) ? 1 : 0); user->zapchannel = !retryzap; zapretry: @@ -1896,14 +1896,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 && c->spies)) { + if (c->fds[0] != origfd || (user->zapchannel && (c->spies || c->monitor))) { 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(c->tech->type, "Zap") || c->spies ? 1 : 0); + retryzap = (strcasecmp(c->tech->type, "Zap") || (c->spies || c->monitor) ? 1 : 0); user->zapchannel = !retryzap; goto zapretry; } |