From 628bbf628ab168f06c405f89b4b7fb084102a862 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sun, 22 Nov 2015 17:25:44 +0100 Subject: util.timer: If possible, close the existing timer handle in order to have only one --- util/timer.lua | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'util/timer.lua') diff --git a/util/timer.lua b/util/timer.lua index 78b4dbd7..eb2bd7ea 100644 --- a/util/timer.lua +++ b/util/timer.lua @@ -19,6 +19,7 @@ local _ENV = nil; local _add_task = server.add_task; +local _server_timer; local _active_timers = 0; local h = indexedbheap.create(); local params = {}; @@ -66,8 +67,13 @@ local function add_task(delay, callback, param) params[id] = param; if next_time == nil or event_time < next_time then next_time = event_time; - _active_timers = _active_timers + 1; - _add_task(next_time - current_time, _on_timer); + if _server_timer then + _server_timer:close(); + _server_timer = nil; + else + _active_timers = _active_timers + 1; + end + _server_timer = _add_task(next_time - current_time, _on_timer); end return id; end -- cgit v1.2.3