Author: bklaas
Date: Tue Jul 27 07:04:29 2010
New Revision: 8994
URL: http://svn.slimdevices.com/jive?rev=8994&view=rev
Log:
Bug: 16402
Description: back port previous 7.6 alarm checkin to 7.5/trunk
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=8994&r1=8993&r2=8994&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
Tue Jul 27 07:04:29 2010
@@ -88,6 +88,9 @@
log:warn('**** self.localPlayer.alarmState: ',
self.localPlayer:getAlarmState())
log:warn('**** RTC fallback running?: ',
self.RTCAlarmTimer:isRunning())
log:warn('**** self.server: ',
self.server)
+ if self.fallbackAlarmTimeout and
self.fallbackAlarmTimeout:isRunning() then
+ log:warn('**** Fallback timeout running?: ',
self.fallbackAlarmTimeout:isRunning())
+ end
if self.server then
log:warn('**** self.server.mac:
', self.server.mac)
end
@@ -458,9 +461,12 @@
end
end
)
- self.fallbackAlarmTimeout:start()
- end
-
+ if self.fallbackAlarmTimeout:isRunning() then
+ self.fallbackAlarmTimeout:restart()
+ else
+ self.fallbackAlarmTimeout:start()
+ end
+ end
end
@@ -660,6 +666,9 @@
if self.previousVolume then
log:warn('setting player back to self.previousVolume: ',
self.previousVolume)
self.localPlayer:volumeLocal(self.previousVolume)
+ end
+ if self.fallbackAlarmTimeout and self.fallbackAlarmTimeout:isRunning()
then
+ self.fallbackAlarmTimeout:stop()
end
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
