Author: bklaas
Date: Fri Jun 18 12:34:59 2010
New Revision: 8883
URL: http://svn.slimdevices.com/jive?rev=8883&view=rev
Log:
Bug: 16303
Description: back off earlier change as sending nil as a player object is valid
(SlimMenus expects this when press-hold of back arrow is done to force a player
disconnect). Adding a check for player object in AlarmSnooze to fix the issue.
Modified:
7.5/branches/7.5.1-controller-fix/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua
7.5/branches/7.5.1-controller-fix/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
Modified:
7.5/branches/7.5.1-controller-fix/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua
URL:
http://svn.slimdevices.com/jive/7.5/branches/7.5.1-controller-fix/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua?rev=8883&r1=8882&r2=8883&view=diff
==============================================================================
---
7.5/branches/7.5.1-controller-fix/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua
(original)
+++
7.5/branches/7.5.1-controller-fix/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua
Fri Jun 18 12:34:59 2010
@@ -282,6 +282,9 @@
function notify_playerCurrent(self, player)
log:info("notify_playerCurrent(", player, ")")
+ if not player then
+ return
+ end
if player:isLocal() then
self.localPlayer = player
end
Modified:
7.5/branches/7.5.1-controller-fix/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
URL:
http://svn.slimdevices.com/jive/7.5/branches/7.5.1-controller-fix/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua?rev=8883&r1=8882&r2=8883&view=diff
==============================================================================
---
7.5/branches/7.5.1-controller-fix/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
(original)
+++
7.5/branches/7.5.1-controller-fix/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
Fri Jun 18 12:34:59 2010
@@ -179,9 +179,7 @@
end
-- notify even if the player has not changed
- if currentPlayer then
- jnt:notify("playerCurrent", currentPlayer)
- end
+ jnt:notify("playerCurrent", currentPlayer)
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
