From: Russell Bryant <russell@russellbryant.com>
Date: Mon, 24 Jan 2011 20:57:42 +0000 (+0000)
Subject: Fix a couple of mistakes in the backport of this patch to 1.4.
X-Git-Tag: 1.4.41-rc1~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4c938415456a982e45b2bab0042953dfa5c62d2;p=thirdparty%2Fasterisk.git

Fix a couple of mistakes in the backport of this patch to 1.4.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@303552 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/pbx.c b/main/pbx.c
index 56135c845d..4bd4ca0106 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -2490,7 +2490,7 @@ static int __ast_pbx_run(struct ast_channel *c)
 				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",
diff --git a/res/res_features.c b/res/res_features.c
index fae659aba7..349318c471 100644
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -418,7 +418,6 @@ static void check_goto_on_transfer(struct ast_channel *chan)
 	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);