diff options
author | Richard Mudgett <rmudgett@digium.com> | 2012-06-06 01:11:12 +0000 |
---|---|---|
committer | Richard Mudgett <rmudgett@digium.com> | 2012-06-06 01:11:12 +0000 |
commit | a2402dbe25b37ded0633054baf5ffeffbb450f40 (patch) | |
tree | 535aae93c25f05864f14ecca3c2c47ba83050cfd /main/features.c | |
parent | faacb8ba5283ccfdcc1e079f683e24c30db4f20f (diff) |
Fix parked call performing a DTMF blind transfer after being retrieved.
When a parked call was retrieved from the parking lot, it could not do a
blind transfer because it caused the involved calls to be hung up
unconditionally.
* Made the ParkedCall application return the ast_bridge_call() return
value.
(closes issue ABE-2862)
Reported by: Vlad Povorozniuc
........
Merged revisions 368567 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 368568 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@368569 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/features.c')
-rw-r--r-- | main/features.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/main/features.c b/main/features.c index dd6357713..37d86086a 100644 --- a/main/features.c +++ b/main/features.c @@ -5353,7 +5353,7 @@ static int park_call_exec(struct ast_channel *chan, const char *data) /*! \brief Pickup parked call */ static int parked_call_exec(struct ast_channel *chan, const char *data) { - int res = 0; + int res; struct ast_channel *peer = NULL; struct parkeduser *pu; struct ast_context *con; @@ -5599,10 +5599,11 @@ static int parked_call_exec(struct ast_channel *chan, const char *data) } ast_verb(3, "Channel %s tried to retrieve nonexistent parked call %d\n", ast_channel_name(chan), park); + res = -1; } parkinglot_unref(parkinglot); - return -1; + return res; } /*! |