[svn-commits] russell: branch 1.4 r303552 - in /branches/1.4: main/pbx.c res/res_features.c

[SVN commits to the Digium repositories]

Author: russell
Date: Mon Jan 24 14:57:42 2011
New Revision: 303552

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=303552
Log:
Fix a couple of mistakes in the backport of this patch to 1.4.

Modified:
    branches/1.4/main/pbx.c
    branches/1.4/res/res_features.c

Modified: branches/1.4/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/main/pbx.c?view=diff&rev=303552&r1=303551&r2=303552
==============================================================================
--- branches/1.4/main/pbx.c (original)
+++ branches/1.4/main/pbx.c Mon Jan 24 14:57:42 2011
@@ -2490,7 +2490,7 @@
 				set_ext_pri(c, "T", 0); /* 0 will become 1 with the c->priority++; at the end */
 				/* If the AbsoluteTimeout is not reset to 0, we'll get an infinite loop */
 				c->whentohangup = 0;
-				ast_channel_clear_softhangup(c, AST_SOFTHANGUP_ASYNCGOTO);
+				ast_channel_clear_softhangup(c, AST_SOFTHANGUP_TIMEOUT);
 			} else if (c->_softhangup) {
 				if (option_debug)
 					ast_log(LOG_DEBUG, "Extension %s, priority %d returned normally even though call was hung up\n",

Modified: branches/1.4/res/res_features.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/res/res_features.c?view=diff&rev=303552&r1=303551&r2=303552
==============================================================================
--- branches/1.4/res/res_features.c (original)
+++ branches/1.4/res/res_features.c Mon Jan 24 14:57:42 2011
@@ -418,7 +418,6 @@
 	ast_parseable_goto(xferchan, goto_on_transfer);
 	xferchan->_state = AST_STATE_UP;
 	ast_clear_flag(xferchan, AST_FLAGS_ALL);	
-	xferchan->_softhangup = 0;
 	ast_channel_clear_softhangup(xferchan, AST_SOFTHANGUP_ALL);
 	if ((f = ast_read(xferchan))) {
 		ast_frfree(f);