Author: bklaas
Date: Mon Jun 21 12:44:45 2010
New Revision: 8896
URL: http://svn.slimdevices.com/jive?rev=8896&view=rev
Log:
r39...@daddymac (orig r8895): bklaas | 2010-06-21 14:42:51 -0500
r39...@daddymac (orig r8881): agrundman | 2010-06-18 09:41:27 -0500
Branch for quick fix to controller/receiver setup
r39...@daddymac (orig r8882): bklaas | 2010-06-18 10:23:07 -0500
Bug: 16303
Description: never send out nil object in playerCurrent notifications
r39...@daddymac (orig r8883): bklaas | 2010-06-18 14:34:59 -0500
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.6/trunk/ (props changed)
7.6/trunk/squeezeplay/ (props changed)
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua
Propchange: 7.6/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Mon Jun 21 12:44:45 2010
@@ -13,7 +13,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/private-branches/fab4-skin:4552
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/private-branches/new-alsa:6567
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:8423
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.5/trunk:8866
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.5/trunk:8895
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Propchange: 7.6/trunk/squeezeplay/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Mon Jun 21 12:44:45 2010
@@ -1,3 +1,11 @@
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.0/trunk/squeezeplay:2197
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk/squeezeplay:2206
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk/squeezeplay:2753
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk/squeezeplay:2761
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk/squeezeplay:7681
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.5/branches/7.5.1-controller-fix/squeezeplay:8883
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0/jive:1017
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/cometd-refactor:592
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/mainMenuRework:1168
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/trunk/jive:2021
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/trunk/squeezeplay:2187
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=8896&r1=8895&r2=8896&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
Mon Jun 21 12:44:45 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
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
