projects
/
asterisk/asterisk.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
436a847
)
un-break three-way calling
author
Kevin P. Fleming
<kpfleming@digium.com>
Fri, 24 Jun 2005 19:15:51 +0000
(19:15 +0000)
committer
Kevin P. Fleming
<kpfleming@digium.com>
Fri, 24 Jun 2005 19:15:51 +0000
(19:15 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6002
65c4cc65
-6c06-0410-ace0-
fbb531ad65f3
channels/chan_zap.c
patch
|
blob
|
history
diff --git
a/channels/chan_zap.c
b/channels/chan_zap.c
index
9f41270
..
a95e4f9
100755
(executable)
--- 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)