Merged revisions 68071 via svnmerge from

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

................
r68071 | file | 2007-06-07 10:21:59 -0400 (Thu, 07 Jun 2007) | 10 lines

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/trunk@68072 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_dial.c b/apps/app_dial.c
index 0d30dc1189fdbb9a9cc8fc679c4e061b8ab2aa49..3b641bdac6ca58b1c42dee8360003f9a1d7ced50 100644 (file)
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -1727,8 +1727,11 @@ out:
        if (option_debug)
                ast_log(LOG_DEBUG, "Exiting with DIALSTATUS=%s.\n", pa.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);      /* XXX probably not the right place for this. */