util.timer: Expire timer instance if another instance is already set to take care of the next scheduled event

1 files changed, 11 insertions, 2 deletions

diff --git a/util/timer.lua b/util/timer.lua
index 9042264d..78b4dbd7 100644
--- a/util/timer.lua
+++ b/util/timer.lua
@@ -43,8 +43,17 @@ local function _on_timer(now)
 			params[_id] = _param;
 		end
 	end
-	next_time = peek;
-	if peek ~= nil then
+
+	if peek ~= nil and _active_timers > 1 and peek == next_time then
+		-- Another instance of _on_timer already set next_time to the same value,
+		-- so it should be safe to not renew this timer event
+		peek = nil;
+	else
+		next_time = peek;
+	end
+
+	if peek then
+		-- peek is the time of the next event
 		return peek - now;
 	end
 	_active_timers = _active_timers - 1;