[Jive-Checkins] r8339 - /7.4/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua

[bklaas]

Author: bklaas
Date: Thu Jan 14 14:09:48 2010
New Revision: 8339

URL: http://svn.slimdevices.com/jive?rev=8339&view=rev
Log:
Bug: 14870
Description: patch from bluegaspode (thanks) that does a cleaner method call 
when back button is hit

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=8339&r1=8338&r2=8339&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 14:09:48 2010
@@ -439,25 +439,25 @@
                text = self:string("ALARM_SNOOZE_TURN_OFF_ALARM"),
                sound = "WINDOWHIDE",
                callback = function()
-                       self:_alarmOff()
+                       self:_alarmOff(true)
                        end,
        })      
        menu:setSelectedIndex(1)
 
        local cancelAction = function()
                window:playSound("WINDOWHIDE")
-               self:_hideAlarmWindow()
+               self:_alarmOff(false)
                return EVENT_CONSUME
        end
 
        local hideWindowAction = function()
                window:playSound("WINDOWHIDE")
-               self:_alarmOff()
+               self:_alarmOff(true)
                return EVENT_UNUSED
        end
 
        local offAction = function()
-               self:_alarmOff()
+               self:_alarmOff(true)
                return EVENT_UNUSED
        end
        
@@ -499,7 +499,7 @@
 end
 
 
-function _alarmOff(self)
+function _alarmOff(self, stopStream)
        if self.alarmInProgress == 'rtc' then
                self.localPlayer:stop(true)
                iconbar:setAlarm('OFF')
@@ -521,7 +521,7 @@
                self.decodeStatePoller:stop()
        end
 
-       if self.localPlayer:isConnected() then
+       if self.localPlayer:isConnected() and stopStream then
                self.localPlayer:stopAlarm()
        end
 end

_______________________________________________
Jive-checkins mailing list
Jive-checkins@lists.slimdevices.com
http://lists.slimdevices.com/mailman/listinfo/jive-checkins