[asterisk-commits] file: trunk r68072 - in /trunk: ./ apps/app_dial.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Thu Jun  7 09:23:21 2007
New Revision: 68072

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

........

................

Modified:
    trunk/   (props changed)
    trunk/apps/app_dial.c

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

Modified: trunk/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_dial.c?view=diff&rev=68072&r1=68071&r2=68072
==============================================================================
--- trunk/apps/app_dial.c (original)
+++ trunk/apps/app_dial.c Thu Jun  7 09:23:21 2007
@@ -1727,8 +1727,11 @@
 	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. */