Author: bklaas
Date: Mon May 24 13:24:32 2010
New Revision: 8805
URL: http://svn.slimdevices.com/jive?rev=8805&view=rev
Log:
Fixed Bug: 16230
Description: timeToAlarm after auto wakeup is the difference between the epoch
seconds in the settings file and now, not just the epoch seconds.
Modified:
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua
Modified:
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua
URL:
http://svn.slimdevices.com/jive/7.5/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua?rev=8805&r1=8804&r2=8805&view=diff
==============================================================================
---
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua
(original)
+++
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua
Mon May 24 13:24:32 2010
@@ -45,8 +45,8 @@
local timeToAlarm
local startTimer = false
if self.alarmNext then
- if self:_inFuture() then
- timeToAlarm = self.alarmNext
+ timeToAlarm = self:_inFuture()
+ if timeToAlarm then
startTimer = true
else
timeToAlarm = 86400000
@@ -56,6 +56,7 @@
-- as it will be set again whenever it is invoked by an
self.alarmNext param
timeToAlarm = 86400000
end
+
self.debugRTCTime = timeToAlarm
self.debugWOLTime = 0
self.RTCAlarmTimer = Timer(timeToAlarm,
@@ -649,7 +650,7 @@
local now = os.time()
if self.alarmNext - now > 0 then
- return true
+ return self.alarmNext - now
end
return false
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
