automerge commit

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

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 2c36f08f7c03cc12bdb68782139fad62ffcc08d2..6889c66422bffcb1e8cbafbd08a25678e4af93e1 100644 (file)
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -2899,7 +2899,7 @@ static int queue_exec(struct ast_channel *chan, void *data)
        queuetimeoutstr = info_ptr;
 
        /* set the expire time based on the supplied timeout; */
-       if (queuetimeoutstr)
+       if (!ast_strlen_zero(queuetimeoutstr))
                qe.expire = qe.start + atoi(queuetimeoutstr);
        else
                qe.expire = 0;