[asterisk-commits] tilghman: branch 1.6.0 r236301 - in /branches/1.6.0: ./ apps/app_stack.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Wed Dec 23 12:26:47 2009
New Revision: 236301

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=236301
Log:
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
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_stack.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/apps/app_stack.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/apps/app_stack.c?view=diff&rev=236301&r1=236300&r2=236301
==============================================================================
--- branches/1.6.0/apps/app_stack.c (original)
+++ branches/1.6.0/apps/app_stack.c Wed Dec 23 12:26:47 2009
@@ -452,12 +452,12 @@
 	 * 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;
 		}