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 56135c845d64d39c8f17dc8db44b80f9e587189c..4bd4ca01063217f25955cb0455e7447922392d23 100644 (file)
--- 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 fae659aba7a07ae94e722f303471e13b2d46b112..349318c471ef2344e29fd7e8886a83cc1448f3db 100644 (file)
--- 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);