Merged revisions 88026 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Thu, 1 Nov 2007 13:30:28 +0000 (13:30 +0000)
committerJoshua Colp <jcolp@digium.com>
Thu, 1 Nov 2007 13:30:28 +0000 (13:30 +0000)
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: https://origsvn.digium.com/svn/asterisk/trunk@88027 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_meetme.c

index 1676b6d..bb3c1e9 100644 (file)
@@ -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;
                                }