luvit: timer: avoid double close

a timer could be closed twice if it is unenrolled and expires in the same loop, make sure this doesn't happen
luvit · Aug 8, 2012 · a8cd419 · a8cd419
1 parent 53e5ad5
commit a8cd419
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/lib/luvit/timer.lua b/lib/luvit/timer.lua
@@ -84,9 +84,13 @@ expiration = function(timer, msecs)
         end
       end
     end
-    timer:stop()
-    timer:close()
-    lists[msecs] = nil
+    -- Remove the timer if it wasn't already
+    -- removed by unenroll
+    if lists[msecs] ~= nil then
+      timer:stop()
+      timer:close()
+      lists[msecs] = nil
+    end
   end
 end
 
@@ -116,6 +120,7 @@ local function unenroll(item)
   local list = lists[item._idleTimeout]
   if list and isEmpty(list) then
     -- empty list
+    list:stop()
     list:close()
     lists[item._idleTimeout] = nil
   end