X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/ddeb786a75215efc3bd47b5b7f29a2ac19b06d28..94204ac2dad82e8b9b206cb596b3a27fb8379640:/widgets/bat.lua

diff --git a/widgets/bat.lua b/widgets/bat.lua
index 485fd57..61828ec 100644
--- a/widgets/bat.lua
+++ b/widgets/bat.lua
@@ -21,9 +21,9 @@ local setmetatable = setmetatable
 
 -- Battery infos
 -- lain.widgets.bat
-local bat = {}
 
 local function worker(args)
+    local bat = {}
     local args = args or {}
     local timeout = args.timeout or 30
     local battery = args.battery or "BAT0"
@@ -122,28 +122,28 @@ local function worker(args)
         settings()
 
         -- notifications for low and critical states
-        bat_now.perc = tonumber(bat_now.perc)
         if bat_now.status == "Discharging" and notify == "on" and bat_now.perc ~= nil
         then
-            if bat_now.perc <= 5
+            local nperc = tonumber(bat_now.perc) or 100
+            if nperc <= 5
             then
                 bat.id = naughty.notify({
                     preset = bat_notification_critical_preset,
-                    replaces_id = bat.id
+                    replaces_id = bat.id,
                 }).id
-            elseif bat_now.perc <= 15
+            elseif nperc <= 15
             then
                 bat.id = naughty.notify({
                     preset = bat_notification_low_preset,
-                    replaces_id = bat.id
+                    replaces_id = bat.id,
                 }).id
             end
         end
     end
 
-    newtimer("bat", timeout, update)
+    newtimer(battery, timeout, update)
 
-    return bat.widget
+    return setmetatable(bat, { __index = bat.widget })
 end
 
-return setmetatable(bat, { __call = function(_, ...) return worker(...) end })
+return setmetatable({}, { __call = function(_, ...) return worker(...) end })