[asterisk-commits] mmichelson: branch 1.6.0 r112395 - in /branches/1.6.0: ./ apps/app_queue.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Wed Apr  2 09:33:33 2008
New Revision: 112395

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

................
r112394 | mmichelson | 2008-04-02 09:32:43 -0500 (Wed, 02 Apr 2008) | 14 lines

Merged revisions 112393 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r112393 | mmichelson | 2008-04-02 09:32:00 -0500 (Wed, 02 Apr 2008) | 6 lines

Ensure that there is no timeout if none is specified.

(closes issue #12349)
Reported by: johnlange


........

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

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

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

Modified: branches/1.6.0/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_queue.c?view=diff&rev=112395&r1=112394&r2=112395
==============================================================================
--- branches/1.6.0/apps/app_queue.c (original)
+++ branches/1.6.0/apps/app_queue.c Wed Apr  2 09:33:33 2008
@@ -4384,7 +4384,7 @@
 	qe.start = time(NULL);
 
 	/* set the expire time based on the supplied timeout; */
-	if (args.queuetimeoutstr)
+	if (!ast_strlen_zero(args.queuetimeoutstr))
 		qe.expire = qe.start + atoi(args.queuetimeoutstr);
 	else
 		qe.expire = 0;