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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@236302 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_stack.c b/apps/app_stack.c
index c326a7486922e002801bae0e189b4cad80792497..c734b7511d246457034dcee0777db8bb367fbc66 100644 (file)
--- 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;
                }