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


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@112395 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_queue.c

@@ -4384,7 +4384,7 @@ static int queue_exec(struct ast_channel *chan, void *data)
 	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;