From: Luke Bonham <copycat-killer@users.noreply.github.com>
Date: Fri, 8 Jul 2016 09:36:54 +0000 (+0200)
Subject: Merge pull request #212 from 0x0d/master
X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/0cfb9187efb0100ab5425419f1e8760dddba0305?hp=41ccab3196c0051d7ce68e1e77ca97acf20db52d

Merge pull request #212 from 0x0d/master

Two bugfixes on Thinkpad X260
---

diff --git a/widgets/bat.lua b/widgets/bat.lua
index 91e826e..ec9a289 100644
--- a/widgets/bat.lua
+++ b/widgets/bat.lua
@@ -131,7 +131,7 @@ local function worker(args)
 
                 local hours     = math.floor(rate_time)
                 local minutes   = math.floor((rate_time - hours) * 60)
-                bat_now.perc    = tonumber(string.format("%d", math.min(100, sum_energy_percentage / #batteries)))
+                bat_now.perc    = tonumber(string.format("%d", math.floor(math.min(100, sum_energy_percentage / #batteries))))
                 bat_now.time    = string.format("%02d:%02d", hours, minutes)
                 bat_now.watt    = tonumber(string.format("%.2f", sum_rate_energy / 1e6))
             elseif bat_now.status == "Full" then
diff --git a/widgets/net.lua b/widgets/net.lua
index ee2cfa7..1883168 100644
--- a/widgets/net.lua
+++ b/widgets/net.lua
@@ -128,12 +128,12 @@ local function worker(args)
             net_now.sent     = string.gsub(string.format('%.1f', net_now.sent), ',', '.')
             net_now.received = string.gsub(string.format('%.1f', net_now.received), ',', '.')
 
-            widget = net.widget
-            settings()
-
             net.last_t = total_t
             net.last_r = total_r
         end
+
+        widget = net.widget
+        settings()
     end
 
     helpers.newtimer(iface, timeout, update)