diff options
author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-02 14:33:33 +0000 |
---|---|---|
committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-02 14:33:33 +0000 |
commit | b6bace044dd9e49e62b1c886f1bae14636c8b3c9 (patch) | |
tree | eca3e07fbc978bc4b9e8adfb9fa5680ebcf0af5f | |
parent | 94c3854d303b0c341b99447719da22253b0ae1c8 (diff) |
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@112395 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | apps/app_queue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c index 320f51318..1c637574a 100644 --- a/apps/app_queue.c +++ b/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; |