summaryrefslogtreecommitdiff
path: root/channel.c
diff options
context:
space:
mode:
authorLuigi Rizzo <rizzo@icir.org>2006-04-06 08:02:35 +0000
committerLuigi Rizzo <rizzo@icir.org>2006-04-06 08:02:35 +0000
commite57131511edccb36c11b14bfcd2b883922b2d460 (patch)
treeb160ba1cb09535fbdda53632f365211873beb83e /channel.c
parentd75fed39ca275efdba1375126f0a91998103810f (diff)
the fix for bug #6399 makes sense. thanks wrmem for the report.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@17753 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channel.c')
-rw-r--r--channel.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/channel.c b/channel.c
index a30f1fa5b..8bedebff5 100644
--- a/channel.c
+++ b/channel.c
@@ -1599,7 +1599,8 @@ struct ast_channel *ast_waitfor_nandfds(struct ast_channel **c, int n, int *fds,
for (x=0; x<n; x++)
ast_clear_flag(c[x], AST_FLAG_BLOCKING);
if (res < 0) { /* Simulate a timeout if we were interrupted */
- *ms = (errno != EINTR) ? -1 : 0;
+ if (errno != EINTR)
+ *ms = -1;
return NULL;
}
if (whentohangup) { /* if we have a timeout, check who expired */