projects
/
asterisk/asterisk.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
62e5828
)
whentohangup is already in seconds, just need to convert to milliseconds
author
Joshua Colp
<jcolp@digium.com>
Fri, 8 Sep 2006 02:54:45 +0000
(
02:54
+0000)
committer
Joshua Colp
<jcolp@digium.com>
Fri, 8 Sep 2006 02:54:45 +0000
(
02:54
+0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@42374
65c4cc65
-6c06-0410-ace0-
fbb531ad65f3
main/channel.c
patch
|
blob
|
history
diff --git
a/main/channel.c
b/main/channel.c
index
dec1f86
..
8448524
100644
(file)
--- 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;
}