Author: titmuss
Date: Sun Feb 24 10:08:10 2008
New Revision: 2015
URL: http://svn.slimdevices.com?rev=2015&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r2012): titmuss | 2008-02-24 17:11:47 +0000
Bug: 7296
Description:
Fix jive sending player register to SN all the time, not just when the pin
screen is
used.
Modified:
trunk/ (props changed)
trunk/jive/src/pkg/jive/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua
Propchange: trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Sun Feb 24 10:08:10 2008
@@ -1,3 +1,3 @@
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2011
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2012
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified:
trunk/jive/src/pkg/jive/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua?rev=2015&root=Jive&r1=2014&r2=2015&view=diff
==============================================================================
---
trunk/jive/src/pkg/jive/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua
(original)
+++
trunk/jive/src/pkg/jive/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua
Sun Feb 24 10:08:10 2008
@@ -1225,13 +1225,19 @@
-- if connecting to SqueezeNetwork, first check jive is linked
- if slimserver:getPin() then
- local snpin = appletManager:loadApplet("SqueezeNetworkPIN")
- snpin:enterPin(slimserver, nil,
- function()
- self:_registerPlayer(slimserver)
- end)
-
+ if slimserver:isSqueezeNetwork() then
+ if slimserver:getPin() then
+ local snpin =
appletManager:loadApplet("SqueezeNetworkPIN")
+ snpin:enterPin(slimserver, nil,
+ function()
+ self:_registerPlayer(slimserver)
+ end)
+
+ return
+ else
+ self:_registerPlayer(slimserver)
+ end
+
return
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
