aboutsummaryrefslogtreecommitdiffstats
path: root/channel.c
diff options
context:
space:
mode:
authormarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2005-04-24 22:54:50 +0000
committermarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2005-04-24 22:54:50 +0000
commitca2e40b5407f0e7316134ccb4e8023a930f2b897 (patch)
tree45a13a3294c84b86f472f576fd99904a48da6059 /channel.c
parentbefaca8efdb7552270fb5204cda24e71577815ae (diff)
If poll returns 0, force *ms to 0
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@5502 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channel.c')
-rwxr-xr-xchannel.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/channel.c b/channel.c
index 9d6007c64..5eb680d02 100755
--- a/channel.c
+++ b/channel.c
@@ -1126,6 +1126,12 @@ struct ast_channel *ast_waitfor_nandfds(struct ast_channel **c, int n, int *fds,
#endif
}
return NULL;
+ } else {
+ /* If no fds signalled, then timeout. So set ms = 0
+ since we may not have an exact timeout.
+ */
+ if (res == 0)
+ *ms = 0;
}
if (havewhen)