summaryrefslogtreecommitdiff
path: root/channels
diff options
context:
space:
mode:
authorKevin P. Fleming <kpfleming@digium.com>2005-06-24 19:15:51 +0000
committerKevin P. Fleming <kpfleming@digium.com>2005-06-24 19:15:51 +0000
commit3ddc33f6743c21878afc0632f66eb1c7b880326e (patch)
tree371a45e9b90ee1464a67b20f31a0ca51ca7ac310 /channels
parent436a8474b08cec283c38c81e7c40ad9569c3f006 (diff)
un-break three-way calling
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6002 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
-rwxr-xr-xchannels/chan_zap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 9f412703b..a95e4f95f 100755
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -3817,7 +3817,7 @@ static struct ast_frame *zt_handle_event(struct ast_channel *ast)
} else {
/* Lets see what we're up to */
if (((ast->pbx) || (ast->_state == AST_STATE_UP)) &&
- (!p->transfertobusy && (p->owner->_state != AST_STATE_BUSY))) {
+ (p->transfertobusy || (p->owner->_state != AST_STATE_BUSY))) {
int otherindex = SUB_THREEWAY;
if (option_verbose > 2)