[asterisk-commits] simon.perreault: branch group/v6 r156820 - /team/group/v6/trunk/main/pbx.c

[SVN commits to the Asterisk project]

Author: simon.perreault
Date: Fri Nov 14 09:30:07 2008
New Revision: 156820

URL: http://svn.digium.com/view/asterisk?view=rev&rev=156820
Log:
Merged r102272. Makes REFER work.

Modified:
    team/group/v6/trunk/main/pbx.c

Modified: team/group/v6/trunk/main/pbx.c
URL: http://svn.digium.com/view/asterisk/team/group/v6/trunk/main/pbx.c?view=diff&rev=156820&r1=156819&r2=156820
==============================================================================
--- team/group/v6/trunk/main/pbx.c (original)
+++ team/group/v6/trunk/main/pbx.c Fri Nov 14 09:30:07 2008
@@ -3305,6 +3305,7 @@
 				
 				if (c->_softhangup == AST_SOFTHANGUP_ASYNCGOTO) {
 					c->_softhangup = 0;
+					continue;
 				} else if (c->_softhangup == AST_SOFTHANGUP_TIMEOUT) {
 					/* atimeout, nothing bad */
 				} else {
@@ -5794,12 +5795,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);