Fix interation of # transfer and flash hook transfer (bug #3011)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-0@4917 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 3aa5678fec25c05192392e5930fd8e0bdbd02344..72b22af7765061874f55b4cda89c5b26d992dc12 100755 (executable)
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -2576,6 +2576,7 @@ static int zt_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags,
        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 @@ static int zt_write(struct ast_channel *ast, struct ast_frame *frame)
                        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");