[svn-commits] tilghman: branch 1.6.0 r160393 - in /branches/1.6.0: ./ apps/app_dial.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Tue Dec  2 17:22:42 2008
New Revision: 160393

URL: http://svn.digium.com/view/asterisk?view=rev&rev=160393
Log:
Merged revisions 156388 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r156388 | tilghman | 2008-11-12 15:34:51 -0600 (Wed, 12 Nov 2008) | 12 lines
  
  Merged revisions 156386 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r156386 | tilghman | 2008-11-12 15:18:57 -0600 (Wed, 12 Nov 2008) | 5 lines
    
    When using call limits under 1 second, infinite call lengths are allowed,
    instead.
    (closes issue #13851)
     Reported by: ruddy
  ........
................

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

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_dial.c?view=diff&rev=160393&r1=160392&r2=160393
==============================================================================
--- branches/1.6.0/apps/app_dial.c (original)
+++ branches/1.6.0/apps/app_dial.c Tue Dec  2 17:22:42 2008
@@ -957,7 +957,12 @@
 	*calldurationlimit = 0;
 	/* more efficient to do it like S(x) does since no advanced opts */
 	if (!config->play_warning && !config->start_sound && !config->end_sound && config->timelimit) {
-		*calldurationlimit = config->timelimit / 1000;
+		if (config->timelimit > 1000) {
+			*calldurationlimit = config->timelimit / 1000;
+		} else if (config->timelimit > 0) {
+			/* Not enough granularity to make it less, but we can't use the special value 0 */
+			*calldurationlimit = 1;
+		}
 		ast_verb(3, "Setting call duration limit to %d seconds.\n",
 			*calldurationlimit);
 		config->timelimit = play_to_caller = play_to_callee =