Author: titmuss
Date: Tue Jul 8 12:13:46 2008
New Revision: 2675
URL: http://svn.slimdevices.com?rev=2675&root=Jive&view=rev
Log:
Bug: N/A
Description:
Fix storing settings when moving a player between two SCs, the server details
were not being
updated.
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimDiscovery/SlimDiscoveryApplet.lua
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimDiscovery/SlimDiscoveryApplet.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimDiscovery/SlimDiscoveryApplet.lua?rev=2675&root=Jive&r1=2674&r2=2675&view=diff
==============================================================================
---
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimDiscovery/SlimDiscoveryApplet.lua
(original)
+++
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimDiscovery/SlimDiscoveryApplet.lua
Tue Jul 8 12:13:46 2008
@@ -468,6 +468,7 @@
function notify_playerCurrent(self, player)
local settings = self:getSettings()
+ local saveSettings = false
local playerId = player and player:getId() or false
@@ -478,19 +479,28 @@
settings.playerId = playerId
settings.playerInit = player and player:getInit()
- local server = player and player:getSlimServer() or false
- if server then
- settings.squeezeNetwork = server:isSqueezeNetwork()
-
- -- remember server if it's not SN
- if not settings.squeezeNetwork then
- settings.serverName = server:getName()
- settings.serverInit = server:getInit()
- end
- end
-
-- legacy setting
settings.currentPlayer = playerId
+
+ saveSettings = true
+ end
+
+ local server = player and player:getSlimServer() or false
+ if server and
+ ( settings.squeezeNetwork ~= server:isSqueezeNetwork()
+ or settings.serverName ~= server:getName() ) then
+ settings.squeezeNetwork = server:isSqueezeNetwork()
+
+ -- remember server if it's not SN
+ if not settings.squeezeNetwork then
+ settings.serverName = server:getName()
+ settings.serverInit = server:getInit()
+ end
+
+ saveSettings = true
+ end
+
+ if saveSettings then
self:storeSettings()
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
