[Jive-Checkins] r8993 - /7.6/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua

[bklaas]

Author: bklaas
Date: Tue Jul 27 07:03:22 2010
New Revision: 8993

URL: http://svn.slimdevices.com/jive?rev=8993&view=rev
Log:
Fixed Bug: 16402
Description: stop fallback alarm timeout timer when fallback alarm is silenced 
e.g. by a snooze action

Modified:
    
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua

Modified: 
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua
URL: 
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua?rev=8993&r1=8992&r2=8993&view=diff
==============================================================================
--- 
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua
 (original)
+++ 
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua
 Tue Jul 27 07:03:22 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
Jive-checkins@lists.slimdevices.com
http://lists.slimdevices.com/mailman/listinfo/jive-checkins