From 3af5eebefce406fba0b8e681b299439af3412207 Mon Sep 17 00:00:00 2001 From: file Date: Wed, 9 Jan 2008 16:13:24 +0000 Subject: Merged revisions 97450 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r97450 | file | 2008-01-09 12:11:17 -0400 (Wed, 09 Jan 2008) | 6 lines 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/trunk@97451 f38db490-d61c-443f-a65b-d21fe96a405b --- apps/app_meetme.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'apps/app_meetme.c') diff --git a/apps/app_meetme.c b/apps/app_meetme.c index ee0de2e0f..9f7c14d91 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -1796,7 +1796,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c goto outrun; } - retryzap = (strcasecmp(chan->tech->type, "Zap") || chan->audiohooks ? 1 : 0); + retryzap = (strcasecmp(chan->tech->type, "Zap") || (chan->audiohooks || chan->monitor) ? 1 : 0); user->zapchannel = !retryzap; zapretry: @@ -2240,14 +2240,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->audiohooks)) { + if (c->fds[0] != origfd || (user->zapchannel && (c->audiohooks || c->monitor))) { 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(c->tech->type, "Zap") || c->audiohooks ? 1 : 0); + retryzap = (strcasecmp(c->tech->type, "Zap") || (c->audiohooks || c->monitor) ? 1 : 0); user->zapchannel = !retryzap; goto zapretry; } -- cgit v1.2.3