summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorJason Parker <jparker@digium.com>2007-11-13 19:48:41 +0000
committerJason Parker <jparker@digium.com>2007-11-13 19:48:41 +0000
commitd24cee9a815630e78e350d1670b254007a01a3bf (patch)
tree8d358c541c4b86d6f3afb9802b0698be0f5f93a5 /res
parentf821071748175d1831d4230c34669317e0b22a7b (diff)
Merged revisions 89248 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 (closes issue #11237) ........ r89248 | qwell | 2007-11-13 13:47:45 -0600 (Tue, 13 Nov 2007) | 7 lines Revert change from revision 67064. It is documented behavior that if a parking extension already exists while using PARKINGEXTEN, dialplan execution will continue. If blind transferring to a Park with PARKINGEXTEN, you must keep this in mind, and handle the failure yourself. Issue 11237, reported by jon. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89249 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res')
-rw-r--r--res/res_features.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/res/res_features.c b/res/res_features.c
index 56053f91d..ca4f6c676 100644
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -401,7 +401,7 @@ int ast_park_call(struct ast_channel *chan, struct ast_channel *peer, int timeou
AST_LIST_UNLOCK(&parkinglot);
ast_free(pu);
ast_log(LOG_WARNING, "Requested parking extension already exists: %s@%s\n", parkingexten, parking_con);
- return -1; /* We failed to park this call, plain and simple so we need to error out */
+ return 0; /* Continue execution if possible */
}
ast_copy_string(pu->parkingexten, parkingexten, sizeof(pu->parkingexten));
x = atoi(parkingexten);