aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorRickard Green <rickard@erlang.org>2015-03-24 00:38:18 +0100
committerRickard Green <rickard@erlang.org>2015-03-24 00:38:18 +0100
commit18464e275987eaa69c627b1a2784a9deeb216c03 (patch)
tree5f03f1fb293335b221c4cfada184ead2142c96f5 /erts
parente52829ceb614b36c31a650dea455a463fc490698 (diff)
downloadotp-18464e275987eaa69c627b1a2784a9deeb216c03.tar.gz
otp-18464e275987eaa69c627b1a2784a9deeb216c03.tar.bz2
otp-18464e275987eaa69c627b1a2784a9deeb216c03.zip
Fix zero timout timers
Diffstat (limited to 'erts')
-rw-r--r--erts/emulator/beam/time.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/beam/time.c b/erts/emulator/beam/time.c
index 9f997e1d0b..3dfd3f79d4 100644
--- a/erts/emulator/beam/time.c
+++ b/erts/emulator/beam/time.c
@@ -524,6 +524,7 @@ erts_set_timer(ErlTimer *p, ErlTimeoutProc timeout,
tiw->nto++;
tiw->at_once.nto++;
*tiw->at_once.tail = p;
+ tiw->at_once.tail = &p->next;
p->next = NULL;
p->timeout_pos = timeout_pos;
timeout_time = ERTS_CLKTCKS_TO_MONOTONIC(timeout_pos);