[Asterisk-cvs] asterisk channel.c,1.102,1.103

[anthm at lists.digium.com]

Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv3654

Modified Files:
	channel.c 
Log Message:
Bug Fix


Index: channel.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channel.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- channel.c	26 Apr 2004 23:22:33 -0000	1.102
+++ channel.c	27 Apr 2004 16:42:43 -0000	1.103
@@ -2335,7 +2335,7 @@
 	return (((now->tv_sec * 1000) + now->tv_usec / 1000) - ((then->tv_sec * 1000) + then->tv_usec / 1000));
 }
 
-static void	 bridge_playfile(struct ast_channel *chan,char *sound,int remain) {
+static void bridge_playfile(struct ast_channel *chan,char *sound,int remain) {
 	int res=0,min=0,sec=0;
 	
 	if(remain > 0) {
@@ -2381,7 +2381,7 @@
 	struct timeval start_time,precise_now;
 	long elapsed_ms=0,time_left_ms=0;
 	int playit=0,playitagain=1,first_time=1;
-	
+
 
 	flags = (config->allowdisconnect||config->allowredirect_out ? AST_BRIDGE_DTMF_CHANNEL_0 : 0) + (config->allowredirect_in ? AST_BRIDGE_DTMF_CHANNEL_1 : 0);
 
@@ -2450,7 +2450,6 @@
 					}
 				}
 			}
-
 			if(time_left_ms <= 0) {
 				if(config->play_to_caller && config->end_sound){
 					bridge_playfile(c0,config->end_sound,0);
@@ -2458,7 +2457,10 @@
 
 				if(config->play_to_callee && config->end_sound){
 					bridge_playfile(c1,config->end_sound,0);
-                }
+				}
+				*fo = NULL;
+				if (who) *rc = who;
+				res = 0;
 				break;
 			}