diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-10-14 17:02:20 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-10-14 17:02:20 +0000 |
| commit | 8dd051949d230cb322c858ec5f841e02c0ef5355 (patch) | |
| tree | 8676e4a61c82c8a223d1c42fcd7066b173f3a1b3 /channels/chan_zap.c | |
| parent | 9521172e85c010f6fdffc3a55fefb2cce518c843 (diff) | |
Make sure when the timeout occurs that we actually break the bridge (bug #5252)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6791 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_zap.c')
| -rwxr-xr-x | channels/chan_zap.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 077eba2f6..eac9c21c0 100755 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -3139,7 +3139,8 @@ static enum ast_bridge_result zt_bridge(struct ast_channel *c0, struct ast_chann ast_mutex_unlock(&c0->lock); ast_mutex_unlock(&c1->lock); - if ((op0 != p0) || + if (!timeoutms || + (op0 != p0) || (op1 != p1) || (ofd0 != c0->fds[0]) || (ofd1 != c1->fds[0]) || |