[svn-commits] mmichelson: branch 1.6.1 r161496 - in /branches/1.6.1: ./ apps/app_stack.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Fri Dec  5 17:29:48 2008
New Revision: 161496

URL: http://svn.digium.com/view/asterisk?view=rev&rev=161496
Log:
Merged revisions 161493 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r161493 | mmichelson | 2008-12-05 17:24:38 -0600 (Fri, 05 Dec 2008) | 8 lines

If the autoloop flag is set on a channel, then we need to 
add 1 to the priority when checking if the extension exists. Otherwise,
gosubs will fail.

This was discovered when investigating an asterisk-users mailing list post
made by Gary Hawkins.


........

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

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

Modified: branches/1.6.1/apps/app_stack.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/apps/app_stack.c?view=diff&rev=161496&r1=161495&r2=161496
==============================================================================
--- branches/1.6.1/apps/app_stack.c (original)
+++ branches/1.6.1/apps/app_stack.c Fri Dec  5 17:29:48 2008
@@ -282,7 +282,7 @@
 		return -1;
 	}
 
-	if (!ast_exists_extension(chan, chan->context, chan->exten, chan->priority, chan->cid.cid_num)) {
+	if (!ast_exists_extension(chan, chan->context, chan->exten, ast_test_flag(chan, AST_FLAG_IN_AUTOLOOP) ? chan->priority + 1 : chan->priority, chan->cid.cid_num)) {
 		ast_log(LOG_ERROR, "Attempt to reach a non-existent destination for gosub: (Context:%s, Extension:%s, Priority:%d)\n",
 				chan->context, chan->exten, chan->priority);
 		ast_copy_string(chan->context, newframe->context, sizeof(chan->context));