mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-30 10:33:13 +00:00
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
This commit is contained in:
@@ -1599,7 +1599,8 @@ struct ast_channel *ast_waitfor_nandfds(struct ast_channel **c, int n, int *fds,
|
|||||||
for (x=0; x<n; x++)
|
for (x=0; x<n; x++)
|
||||||
ast_clear_flag(c[x], AST_FLAG_BLOCKING);
|
ast_clear_flag(c[x], AST_FLAG_BLOCKING);
|
||||||
if (res < 0) { /* Simulate a timeout if we were interrupted */
|
if (res < 0) { /* Simulate a timeout if we were interrupted */
|
||||||
*ms = (errno != EINTR) ? -1 : 0;
|
if (errno != EINTR)
|
||||||
|
*ms = -1;
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
if (whentohangup) { /* if we have a timeout, check who expired */
|
if (whentohangup) { /* if we have a timeout, check who expired */
|
||||||
|
Reference in New Issue
Block a user