aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2006-09-08 02:54:45 +0000
committerfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2006-09-08 02:54:45 +0000
commit406b26d6b6b878e676cd27f831ed1849fd18d6c6 (patch)
tree5adc54a2e6eb4c22d4cdddfbc8f09fc9e42f7a9d /main
parentdad1faf4ae07594cc278a7e89729b2d5a16e6485 (diff)
whentohangup is already in seconds, just need to convert to milliseconds
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@42374 f38db490-d61c-443f-a65b-d21fe96a405b
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;
}