merge and resolve conflicts from #134; #114

[etc/awesome.git] / helpers.lua

diff --git a/helpers.lua b/helpers.lua
index 4e90e169c15a570bb31aa4c6fa3f1ac9e70c5336..503c40eaf0dbc54df0854e2f86f08e90d4799670 100644 (file)
--- a/helpers.lua
+++ b/helpers.lua
@@ -76,10 +76,16 @@ end
 
 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 })
+        helpers.timer_table[name]:start()
+    end
+
     helpers.timer_table[name]:connect_signal("timeout", fun)
-    helpers.timer_table[name]:start()
+
     if not nostart then
         helpers.timer_table[name]:emit_signal("timeout")
     end