[svn-commits] file: branch 1.4 r68071 - in /branches/1.4: ./ apps/app_dial.c

[svn-commits at lists.digium.com]

Author: file
Date: Thu Jun  7 09:21:59 2007
New Revision: 68071

URL: http://svn.digium.com/view/asterisk?view=rev&rev=68071
Log:
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)

........

Modified:
    branches/1.4/   (props changed)
    branches/1.4/apps/app_dial.c

Propchange: branches/1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: branches/1.4/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/apps/app_dial.c?view=diff&rev=68071&r1=68070&r2=68071
==============================================================================
--- branches/1.4/apps/app_dial.c (original)
+++ branches/1.4/apps/app_dial.c Thu Jun  7 09:21:59 2007
@@ -1685,8 +1685,11 @@
 	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);