aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2009-05-06 22:20:14 +0000
committerjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2009-05-06 22:20:14 +0000
commitf745cee73888b560addd353a84dec38d68345169 (patch)
treec5ffc408fd9b14647ee34ddc6220be8d19ffdacc /main
parentfa0997745188028adb5a2c18aa28fa83b5305e8b (diff)
Merged revisions 192861 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r192861 | jpeeler | 2009-05-06 17:17:27 -0500 (Wed, 06 May 2009) | 17 lines 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: http://svn.digium.com/svn/asterisk/branches/1.6.2@192874 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r--main/features.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/main/features.c b/main/features.c
index 85aaa1e0f..2273d0b7c 100644
--- a/main/features.c
+++ b/main/features.c
@@ -3421,7 +3421,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", ""))
@@ -3430,7 +3430,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)