From 18464e275987eaa69c627b1a2784a9deeb216c03 Mon Sep 17 00:00:00 2001
From: Rickard Green <rickard@erlang.org>
Date: Tue, 24 Mar 2015 00:38:18 +0100
Subject: Fix zero timout timers

---
 erts/emulator/beam/time.c | 1 +
 1 file changed, 1 insertion(+)

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);
-- 
cgit v1.2.3