[svn-commits] file: trunk r102272 - /trunk/main/pbx.c

[SVN commits to the Digium repositories]

Author: file
Date: Mon Feb  4 09:16:05 2008
New Revision: 102272

URL: http://svn.digium.com/view/asterisk?view=rev&rev=102272
Log:
Update handling of asyncgoto so it properly works on channels that are currently executing a PBX.
(closes issue #11914)
Reported by: arnd
(closes issue #11753)
Reported by: johan

Modified:
    trunk/main/pbx.c

Modified: trunk/main/pbx.c
URL: http://svn.digium.com/view/asterisk/trunk/main/pbx.c?view=diff&rev=102272&r1=102271&r2=102272
==============================================================================
--- trunk/main/pbx.c (original)
+++ trunk/main/pbx.c Mon Feb  4 09:16:05 2008
@@ -3324,6 +3324,7 @@
 				
 				if (c->_softhangup == AST_SOFTHANGUP_ASYNCGOTO) {
 					c->_softhangup = 0;
+					continue;
 				} else if (c->_softhangup == AST_SOFTHANGUP_TIMEOUT) {
 					/* atimeout, nothing bad */
 				} else {
@@ -5852,12 +5853,8 @@
 		ast_copy_string(chan->context, context, sizeof(chan->context));
 	if (!ast_strlen_zero(exten))
 		ast_copy_string(chan->exten, exten, sizeof(chan->exten));
-	if (priority > -1) {
+	if (priority > -1)
 		chan->priority = priority;
-		/* see flag description in channel.h for explanation */
-		if (ast_test_flag(chan, AST_FLAG_IN_AUTOLOOP))
-			chan->priority--;
-	}
 
 	ast_channel_unlock(chan);