# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1448209220 -3600
# Node ID 5c2c8aeb4690006069ab30e0d6685c67bfbf37d1
# Parent  58e260832334c4f804d330906d0a715f8bb85d48
util.timer: Expire timer instance if another instance is already set to take care of the next scheduled event

diff -r 58e260832334 -r 5c2c8aeb4690 util/timer.lua
--- a/util/timer.lua	Sun Nov 22 17:18:29 2015 +0100
+++ b/util/timer.lua	Sun Nov 22 17:20:20 2015 +0100
@@ -43,8 +43,17 @@
 			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;