#198: correct logic

diff --git a/widgets/pulsebar.lua b/widgets/pulsebar.lua
index 6955b0436961240282d042666af85b36f6e5e342..5004be6415e4608b3e7a20a36e5c64ccfadf7a6b 100644 (file)
--- a/widgets/pulsebar.lua
+++ b/widgets/pulsebar.lua
@@ -1,10 +1,10 @@
 
 --[[
 
 --[[

-
-     Licensed under GNU General Public License v2
-      * (c) 2013, Luke Bonham
-      * (c) 2013, Rman
-
+                                                  
+     Licensed under GNU General Public License v2 
+      * (c) 2013, Luke Bonham                     
+      * (c) 2013, Rman                            
+                                                  

 --]]
 
 local newtimer     = require("lain.helpers").newtimer
 --]]
 
 local newtimer     = require("lain.helpers").newtimer

diff --git a/widgets/weather.lua b/widgets/weather.lua
index 7ff498add77fea70203339e92d0d12cfa179b43b..75c23426990ff9ddbe3e1173e4ce019dd92a1b7f 100644 (file)
--- a/widgets/weather.lua
+++ b/widgets/weather.lua
@@ -126,9 +126,9 @@ local function worker(args)
 
             if not err and weather_now and tonumber(weather_now["cod"]) == 200 then
                 -- weather icon based on localtime
 
             if not err and weather_now and tonumber(weather_now["cod"]) == 200 then
                 -- weather icon based on localtime

-                now     = os.time() - (utc * 3600)
-                sunrise = tonumber(weather_now["sys"]["sunrise"])
-                sunset  = tonumber(weather_now["sys"]["sunset"])
+                now     = os.time()
+                sunrise = tonumber(weather_now["sys"]["sunrise"]) + (utc * 3600)
+                sunset  = tonumber(weather_now["sys"]["sunset"]) + (utc * 3600)

                 icon    = weather_now["weather"][1]["icon"]
 
                 if sunrise <= now and now <= sunset then
                 icon    = weather_now["weather"][1]["icon"]
 
                 if sunrise <= now and now <= sunset then