kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 19:28:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 68071 via svnmerge from

Browse Source 
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
This commit is contained in:
Joshua Colp
2007-06-07 14:23:21 +00:00
parent 9af51baee7
commit 2492bf26fb
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/app_dial.c
View File

@@ -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. */