From: luke bonham <dadasignificanulla@gmail.com>
Date: Sun, 6 Oct 2013 19:16:25 +0000 (+0200)
Subject: bat: fix issue #17
X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/528d51fbc2147d15183d1bf3c75cd19de7f2722b?ds=inline;hp=-c

bat: fix issue #17
---

528d51fbc2147d15183d1bf3c75cd19de7f2722b
diff --git a/layout/centerfair.lua b/layout/centerfair.lua
index d9ea677..49b4a14 100644
--- a/layout/centerfair.lua
+++ b/layout/centerfair.lua
@@ -3,7 +3,7 @@
                                                   
      Licensed under GNU General Public License v2 
       * (c) 2013,      Luke Bonham                
-      * (c) 2012,      Nicolas Estibals           
+      * (c) 2010,      Nicolas Estibals           
       * (c) 2010-2012, Peter Hofmann              
                                                   
 --]]
diff --git a/widgets/bat.lua b/widgets/bat.lua
index aa89640..a064e30 100644
--- a/widgets/bat.lua
+++ b/widgets/bat.lua
@@ -79,8 +79,21 @@ local function worker(args)
             if min < 0 then min = 0 elseif min > 59 then min = 59 end
 
             bat_now.time = string.format("%02d:%02d", hrs, min)
-            bat_now.perc = string.format("%d", (rem / tot) * 100)
-            bat_now.watt = string.format("%.2fW", (rate * ratev) / 1e12)
+
+            local perc = (rem / tot) * 100
+            if perc <= 100 then
+                bat_now.perc = string.format("%d", perc)
+            elseif perc > 100 then
+                bat_now.perc = "100"
+            elseif perc < 0 then
+                bat_now.perc = "0"
+            end
+
+            if rate ~= nil and ratev ~= nil then
+                bat_now.watt = string.format("%.2fW", (rate * ratev) / 1e12)
+            else
+                bat_not.watt = "N/A"
+            end
 
             -- notifications for low and critical states
             if bat_now.status == "Discharging"