diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-07 14:23:21 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-07 14:23:21 +0000 |
| commit | b4116d674d2694b4e42951a54e01f0127e3a8339 (patch) | |
| tree | 90df984ed03cb8fba022241eaca7739436e09605 /apps | |
| parent | e79a928ecf02b891dd2c871f0cf0062c875e64b4 (diff) | |
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: http://svn.digium.com/svn/asterisk/trunk@68072 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_dial.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c index 0d30dc118..3b641bdac 100644 --- 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. */ |