[Asterisk-cvs] asterisk/channels chan_zap.c,1.404,1.405

[markster at lists.digium.com]

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

Modified Files:
	chan_zap.c 
Log Message:
Fix interation of # transfer and flash hook transfer (bug #3011)


Index: chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.404
retrieving revision 1.405
diff -u -d -r1.404 -r1.405
--- chan_zap.c	25 Jan 2005 06:10:20 -0000	1.404
+++ chan_zap.c	28 Jan 2005 05:19:06 -0000	1.405
@@ -2606,6 +2606,7 @@
 	if (flags & (AST_BRIDGE_DTMF_CHANNEL_0 | AST_BRIDGE_DTMF_CHANNEL_1))
 		return -2;
 		
+		
 	ast_mutex_lock(&c0->lock);
 	ast_mutex_lock(&c1->lock);
 
@@ -4256,6 +4257,11 @@
 			ast_log(LOG_DEBUG, "Dropping frame since I'm still dialing on %s...\n",ast->name);
 		return 0;
 	}
+	if (!p->owner) {
+		if (option_debug)
+			ast_log(LOG_DEBUG, "Dropping frame since there is no active owner on %s...\n",ast->name);
+		return 0;
+	}
 	if (p->cidspill) {
 		if (option_debug)
 			ast_log(LOG_DEBUG, "Dropping frame since I've still got a callerid spill\n");