Author: bklaas
Date: Mon Feb 1 07:41:32 2010
New Revision: 8439
URL: http://svn.slimdevices.com/jive?rev=8439&view=rev
Log:
r38...@daddymac-520 (orig r8423): ayoung | 2010-01-29 07:33:17 -0500
Fixed Bug 15444: note when current player disconnects so that reconnection is
noticed later
Modified:
7.5/trunk/ (props changed)
7.5/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
Propchange: 7.5/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Mon Feb 1 07:41:32 2010
@@ -12,7 +12,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/private-branches/fab4-autoswitch:5831
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:8418
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:8423
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
Modified: 7.5/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
URL:
http://svn.slimdevices.com/jive/7.5/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua?rev=8439&r1=8438&r2=8439&view=diff
==============================================================================
--- 7.5/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua (original)
+++ 7.5/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua Mon Feb 1
07:41:32 2010
@@ -417,7 +417,7 @@
end
-- Check have we changed SqueezeCenter
- if self.serverRefreshInProgress or self.slimServer ~= slimServer then
+ if self.serverRefreshInProgress or self.slimServer ~= slimServer then
if self.slimServer == slimServer and
self.serverRefreshInProgress then
log:info("Same server but serverRefreshInProgress in
progress: ", slimServer)
end
@@ -615,7 +615,7 @@
if self == currentPlayer then
self.jnt:notify('playerDisconnected', self)
-
+ self.info.connected = false
-- dont' delete state if this is the current player
return
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
