kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-21 12:54:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4907 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2005-01-28 05:19:06 +00:00
parent b1e0f0f102
commit 1be3670efe
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
channels/chan_zap.c
View File

@@ -2606,6 +2606,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)) if (flags & (AST_BRIDGE_DTMF_CHANNEL_0 | AST_BRIDGE_DTMF_CHANNEL_1))
return -2; return -2;
ast_mutex_lock(&c0->lock); ast_mutex_lock(&c0->lock);
ast_mutex_lock(&c1->lock); ast_mutex_lock(&c1->lock);
@@ -4256,6 +4257,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); ast_log(LOG_DEBUG, "Dropping frame since I'm still dialing on %s...\n",ast->name);
return 0; 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 (p->cidspill) {
if (option_debug) if (option_debug)
ast_log(LOG_DEBUG, "Dropping frame since I've still got a callerid spill\n"); ast_log(LOG_DEBUG, "Dropping frame since I've still got a callerid spill\n");