[Asterisk-cvs] asterisk/channels chan_zap.c,1.344.2.11,1.344.2.12

[russell at lists.digium.com]

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

Modified Files:
      Tag: v1-0
	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.344.2.11
retrieving revision 1.344.2.12
diff -u -d -r1.344.2.11 -r1.344.2.12
--- chan_zap.c	22 Jan 2005 01:27:08 -0000	1.344.2.11
+++ chan_zap.c	29 Jan 2005 07:19:10 -0000	1.344.2.12
@@ -2576,6 +2576,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);
 
@@ -4165,6 +4166,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");