some cpu usage improvements

[etc/awesome.git] / helpers.lua

diff --git a/helpers.lua b/helpers.lua
index 4ece329a6dc886f4e106ceb2711d1589a0a99334..137bd6ab54f4e36bd051f84e1b1cf39cd515b25f 100644 (file)
--- a/helpers.lua
+++ b/helpers.lua
@@ -8,7 +8,7 @@
 
 local debug  = require("debug")
 
 
 local debug  = require("debug")
 

-local capi   = { timer = timer }
+local capi   = { timer = (type(timer) == 'table' and timer or require ("gears.timer")) }

 local io     = { open  = io.open,
                  lines = io.lines,
                  popen = io.popen }
 local io     = { open  = io.open,
                  lines = io.lines,
                  popen = io.popen }


@@ -77,8 +77,11 @@ end
 
 helpers.timer_table = {}
 
 
 helpers.timer_table = {}
 

-function helpers.newtimer(name, timeout, fun, nostart)
-    helpers.timer_table[name] = capi.timer({ timeout = timeout })
+function helpers.newtimer(_name, timeout, fun, nostart)
+    local name = timeout
+    if not helpers.timer_table[name] then
+        helpers.timer_table[name] = capi.timer({ timeout = timeout })
+    end

     helpers.timer_table[name]:connect_signal("timeout", fun)
     helpers.timer_table[name]:start()
     if not nostart then
     helpers.timer_table[name]:connect_signal("timeout", fun)
     helpers.timer_table[name]:start()
     if not nostart then