automerge commit

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

diff --git a/apps/app_dial.c b/apps/app_dial.c
index 074226e0d2c3c74fa9175fe4825927392c2e35a3..ccd6489c87b4314cdcfc08f3d813a52828f65c76 100644 (file)
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -1660,8 +1660,11 @@ out:
        pbx_builtin_setvar_helper(chan, "DIALSTATUS", status);
        ast_log(LOG_DEBUG, "Exiting with DIALSTATUS=%s.\n", status);
        
-       if ((ast_test_flag(peerflags, OPT_GO_ON)) && (!chan->_softhangup) && (res != AST_PBX_KEEPALIVE))
+       if ((ast_test_flag(peerflags, OPT_GO_ON)) && (!chan->_softhangup) && (res != AST_PBX_KEEPALIVE)) {
+               if (calldurationlimit)
+                       chan->whentohangup = 0;
                res=0;
+       }
        
        LOCAL_USER_REMOVE(u);