# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1270670466 -3600
# Node ID 0fe9cfaeaed7c7bdbf32d34d908916e752f50aad
# Parent  abd1a30330e018034c8b00c6821359152da5d225# Parent  49b5c87d2fa0082c2ad5ee8ab35f2e6cc69d36aa
Merge 0.7->trunk

diff -r abd1a30330e0 -r 0fe9cfaeaed7 util/timer.lua
--- a/util/timer.lua	Wed Apr 07 17:41:35 2010 +0100
+++ b/util/timer.lua	Wed Apr 07 21:01:06 2010 +0100
@@ -55,11 +55,12 @@
 else
 	local EVENT_LEAVE = (event.core and event.core.LEAVE) or -1;
 	function _add_task(delay, func)
-		event_base:addevent(nil, 0, function ()
+		local event_handle;
+		event_handle = event_base:addevent(nil, 0, function ()
 			local ret = func();
 			if ret then
 				return 0, ret;
-			else
+			elseif event_handle then
 				return EVENT_LEAVE;
 			end
 		end