Mercurial > lxmppd-hg-xmllex / changeset
changeset
Merge 0.7->trunk
Wed, 07 Apr 2010 21:01:06 +0100
- author
- Matthew Wild <mwild1@gmail.com>
- date
- Wed, 07 Apr 2010 21:01:06 +0100
- changeset 2965
- 0fe9cfaeaed7
- parent 2963
- abd1a30330e0 (current diff)
- parent 2964
- 49b5c87d2fa0 (diff)
- child 2966
- e78436234775
Merge 0.7->trunk
--- 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
