[svn-commits] file: trunk r88027 - in /trunk: ./ apps/app_meetme.c

[SVN commits to the Digium repositories]

Author: file
Date: Thu Nov  1 08:30:28 2007
New Revision: 88027

URL: http://svn.digium.com/view/asterisk?view=rev&rev=88027
Log:
Merged revisions 88026 via svnmerge from 
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!)

........

Modified:
    trunk/   (props changed)
    trunk/apps/app_meetme.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_meetme.c?view=diff&rev=88027&r1=88026&r2=88027
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Thu Nov  1 08:30:28 2007
@@ -2039,14 +2039,14 @@
 				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;
 				}