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: https://origsvn.digium.com/svn/asterisk/trunk@97451 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index ee0de2e..9f7c14d 100644 (file)
--- 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;
                                }