summaryrefslogtreecommitdiff
path: root/main/features.c
diff options
context:
space:
mode:
authorJeff Peeler <jpeeler@digium.com>2009-05-06 22:17:27 +0000
committerJeff Peeler <jpeeler@digium.com>2009-05-06 22:17:27 +0000
commit1c05448f5ab4cbd86791bed0a30c2221d730ee14 (patch)
treeab9075ca69454cc3676af32941bc0867927d8f4b /main/features.c
parent658f81cb574e0c9f8548a0c1d9278bb307a1c582 (diff)
Merged revisions 192858 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r192858 | jpeeler | 2009-05-06 17:15:19 -0500 (Wed, 06 May 2009) | 10 lines Make ParkedCall application stop execution of the dialplan after hang up Just changed park_exec to always return non-zero. I really wasn't entirely sure at first if this was a bug. Decided it was since it would be surprising when not using ParkedCall in the dialplan to hang up and have dialplan execution continue. (closes issue #14555) Reported by: francesco_r ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@192861 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/features.c')
-rw-r--r--main/features.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/main/features.c b/main/features.c
index 7944d4cb8..877e8ee41 100644
--- a/main/features.c
+++ b/main/features.c
@@ -3484,7 +3484,7 @@ static int park_exec_full(struct ast_channel *chan, void *data, struct ast_parki
/* Simulate the PBX hanging up */
ast_hangup(peer);
- return res;
+ return -1;
} else {
/*! \todo XXX Play a message XXX */
if (ast_stream_and_wait(chan, "pbx-invalidpark", ""))
@@ -3493,7 +3493,7 @@ static int park_exec_full(struct ast_channel *chan, void *data, struct ast_parki
res = -1;
}
- return res;
+ return -1;
}
static int park_exec(struct ast_channel *chan, void *data)