Author: bklaas
Date: Thu Jan 14 15:31:08 2010
New Revision: 8343
URL: http://svn.slimdevices.com/jive?rev=8343&view=rev
Log:
Bug: 14870
Description: in the event of an alarmState notification for the local player
and no rtc alarm currently firing, the alarm window should hide
if alarmState is 'active', a new one will be brought to screen
Modified:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua
Modified:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua
URL:
http://svn.slimdevices.com/jive/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua?rev=8343&r1=8342&r2=8343&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua
Thu Jan 14 15:31:08 2010
@@ -90,6 +90,12 @@
log:warn('notify_playerAlarmState received for ', player, ' with
alarmState of ', alarmState)
if player:isLocal() then
log:warn('**************************** notify_playerAlarmState
received: ', alarmState, ' ', alarmNext)
+ -- if there's an existing alarm window on the screen and the
rtc alarm isn't firing,
+ -- we're going to hide it in the event of this notification. if
alarmState is 'active', we bring up a new one
+ if self.alarmInProgress ~= 'rtc' then
+ self:_hideAlarmWindow()
+ end
+
if alarmState == 'active' then
if player ~= Player:getCurrentPlayer() then
log:warn('alarm has fired locally, switching to
local player')
@@ -109,7 +115,6 @@
self.alarmInProgress = 'server'
self:_stopTimer()
- self:_hideAlarmWindow()
self:openAlarmWindow('server')
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
