diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-01 21:19:46 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-01 21:19:46 +0000 |
| commit | 23437497cf138a3cdef9277facc2abbc4343a54e (patch) | |
| tree | a0eb76b0b85a79fb7b46d90c8b64ddb5b357254d /main | |
| parent | e367cc41ba2d8f51a3c49d9cbc466a2a45d53b14 (diff) | |
Merged revisions 145553 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r145553 | mmichelson | 2008-10-01 16:06:26 -0500 (Wed, 01 Oct 2008) | 13 lines
The logic surrounding the return value of ast_spawn_extension
within ast_bridge_call was reversed.
This problem was observed when a blind transfer placed from
the callee channel of a test call failed.
While the problem I am solving here is exactly the same
as what was reported in issue #13584, the difference is
that this fix I am applying is trunk-only. Issue #13584
was reported against the 1.4 branch, and my tests
of 1.4's blind transfers appear to work fine.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@145556 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/features.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/features.c b/main/features.c index 7f2dba854..7ff0ecc85 100644 --- a/main/features.c +++ b/main/features.c @@ -2193,7 +2193,7 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast ast_copy_string(chan->exten, "h", sizeof(chan->exten)); chan->priority = 1; ast_channel_unlock(chan); - while ((res = ast_spawn_extension(chan, chan->context, chan->exten, chan->priority, chan->cid.cid_num, &found, 1)) == 0) { + while (!(res = ast_spawn_extension(chan, chan->context, chan->exten, chan->priority, chan->cid.cid_num, &found, 1)) == 0) { chan->priority++; } if (found && res) |