Author: bklaas
Date: Wed Jun 25 13:43:40 2008
New Revision: 2626
URL: http://svn.slimdevices.com?rev=2626&root=Jive&view=rev
Log:
Bug: n/a
Description: check that player:getSlimServer() returns a server obj before
making further assumptions on it,
as a player obj doesn't necessarily have a server object tied to it now
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua?rev=2626&root=Jive&r1=2625&r2=2626&view=diff
==============================================================================
---
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
(original)
+++
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
Wed Jun 25 13:43:40 2008
@@ -161,7 +161,7 @@
end
-- check current player
- if currentPlayer and server == currentPlayer:getSlimServer() then
+ if currentPlayer and currentPlayer:getSlimServer() and server ==
currentPlayer:getSlimServer() then
item.style = 'checkedNoAction'
item.callback = nil
elseif not currentPlayer or not currentPlayer:canConnectToServer() then
@@ -171,7 +171,7 @@
self.serverMenu:addItem(item)
self.serverList[id] = item
- if currentPlayer and server == currentPlayer:getSlimServer() then
+ if currentPlayer and currentPlayer:getSlimServer() and server ==
currentPlayer:getSlimServer() then
self.serverMenu:setSelectedItem(item)
end
end
Modified:
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua?rev=2626&root=Jive&r1=2625&r2=2626&view=diff
==============================================================================
---
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua
(original)
+++
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua
Wed Jun 25 13:43:40 2008
@@ -65,7 +65,7 @@
return
end
- if not meta.player then
+ if not meta.player or not meta.player:getSlimServer()
then
log:warn("Firmware upgrade response but not
connected to server")
return
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
