summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2006-09-08 02:54:45 +0000
committerJoshua Colp <jcolp@digium.com>2006-09-08 02:54:45 +0000
commitd597b76c369376c4fa80fa9ccdbf206d695f7f77 (patch)
tree5adc54a2e6eb4c22d4cdddfbc8f09fc9e42f7a9d /main
parent62e58282ebf3444089085c54f5a146386c939389 (diff)
whentohangup is already in seconds, just need to convert to milliseconds
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@42374 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
-rw-r--r--main/channel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/channel.c b/main/channel.c
index dec1f86ba..84485240b 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -1720,7 +1720,7 @@ struct ast_channel *ast_waitfor_nandfds(struct ast_channel **c, int n, int *fds,
/* Wait full interval */
rms = *ms;
if (whentohangup) {
- rms = (whentohangup - now) * 1000; /* timeout in milliseconds */
+ rms = whentohangup * 1000; /* timeout in milliseconds */
if (*ms >= 0 && *ms < rms) /* original *ms still smaller */
rms = *ms;
}