From b3d8c070f940572d53e8bea734a7abef38411c56 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Wed, 23 Dec 2015 11:43:39 +0100 Subject: util.timer: Reschedule timers from stop() if the next pending event is stopped --- util/timer.lua | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'util/timer.lua') diff --git a/util/timer.lua b/util/timer.lua index eb2bd7ea..2277ee77 100644 --- a/util/timer.lua +++ b/util/timer.lua @@ -79,7 +79,16 @@ local function add_task(delay, callback, param) end local function stop(id) params[id] = nil; - return h:remove(id); + local result, item, result_sync = h:remove(id); + local peek = h:peek(); + if peek ~= next_time and _server_timer then + next_time = peek; + _server_timer:close(); + if next_time ~= nil then + _server_timer = _add_task(next_time - get_time(), _on_timer); + end + end + return result, item, result_sync; end local function reschedule(id, delay) local current_time = get_time(); -- cgit v1.2.3