Merged revisions 68070 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r68070 | file | 2007-06-07 10:19:40 -0400 (Thu, 07 Jun 2007) | 2 lines

Allow the 'g' option to work if used with the 'S' option. (issue #9888 reported by gasparz)

........

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

diff --git a/apps/app_dial.c b/apps/app_dial.c
index 67449aee96f34c17d9001c8458edeeac98e3fadb..c18858021eb5e8503742a5d09936c1c5459585a9 100644 (file)
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -1685,8 +1685,11 @@ out:
        if (option_debug)
                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;
+       }
 
 done:
        ast_module_user_remove(u);