diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-12-23 18:26:57 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-12-23 18:26:57 +0000 |
| commit | bffba37d2d7878d317b52a79f5a373eac1c1168d (patch) | |
| tree | de246f5de418cffdeeadf522e514643db18d1153 /apps | |
| parent | cb6938c02ce586b9c707c5b97b21e432cbf89a7c (diff) | |
Merged revisions 236300 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r236300 | tilghman | 2009-12-23 12:25:27 -0600 (Wed, 23 Dec 2009) | 7 lines
AGI may be invoked from outside the dialplan
(closes issue #16510)
Reported by: atis
Patches:
20091223__issue16510.diff.txt uploaded by tilghman (license 14)
Tested by: atis
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@236302 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_stack.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/app_stack.c b/apps/app_stack.c index c326a7486..c734b7511 100644 --- a/apps/app_stack.c +++ b/apps/app_stack.c @@ -455,12 +455,12 @@ static int handle_gosub(struct ast_channel *chan, AGI *agi, int argc, char **arg * call a Gosub for the CALLEE channel in Dial or Queue. */ if (argc == 5) { - if (asprintf(&gosub_args, "%s,%s,%d(%s)", argv[1], argv[2], priority + 1, argv[4]) < 0) { + if (asprintf(&gosub_args, "%s,%s,%d(%s)", argv[1], argv[2], priority + (chan->pbx ? 1 : 0), argv[4]) < 0) { ast_log(LOG_WARNING, "asprintf() failed: %s\n", strerror(errno)); gosub_args = NULL; } } else { - if (asprintf(&gosub_args, "%s,%s,%d", argv[1], argv[2], priority + 1) < 0) { + if (asprintf(&gosub_args, "%s,%s,%d", argv[1], argv[2], priority + (chan->pbx ? 1 : 0)) < 0) { ast_log(LOG_WARNING, "asprintf() failed: %s\n", strerror(errno)); gosub_args = NULL; } |