Author: bklaas
Date: Mon Jan 3 15:18:12 2011
New Revision: 9277
URL: http://svn.slimdevices.com/jive?rev=9277&view=rev
Log:
Fixed Bug: 16752
Description: do not allow Networking:checkNetworkHealth() method to be called
before setup is complete
Modified:
7.6/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SetupWelcome/SetupWelcomeApplet.lua
7.6/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SetupWelcome/SetupWelcomeMeta.lua
7.6/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeboxFab4/SqueezeboxFab4Applet.lua
Modified:
7.6/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SetupWelcome/SetupWelcomeApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SetupWelcome/SetupWelcomeApplet.lua?rev=9277&r1=9276&r2=9277&view=diff
==============================================================================
---
7.6/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SetupWelcome/SetupWelcomeApplet.lua
(original)
+++
7.6/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SetupWelcome/SetupWelcomeApplet.lua
Mon Jan 3 15:18:12 2011
@@ -536,6 +536,12 @@
end
end
+function isSetupDone(self)
+ local settings = self:getSettings()
+
+ return settings and settings.setupDone
+end
+
function _setupDone(self, setupDone, registerDone)
log:info("network setup complete")
Modified:
7.6/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SetupWelcome/SetupWelcomeMeta.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SetupWelcome/SetupWelcomeMeta.lua?rev=9277&r1=9276&r2=9277&view=diff
==============================================================================
---
7.6/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SetupWelcome/SetupWelcomeMeta.lua
(original)
+++
7.6/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SetupWelcome/SetupWelcomeMeta.lua
Mon Jan 3 15:18:12 2011
@@ -53,6 +53,7 @@
function registerApplet(meta)
meta:registerService("startSetup")
meta:registerService("startRegister")
+ meta:registerService("isSetupDone")
end
Modified:
7.6/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeboxFab4/SqueezeboxFab4Applet.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeboxFab4/SqueezeboxFab4Applet.lua?rev=9277&r1=9276&r2=9277&view=diff
==============================================================================
---
7.6/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeboxFab4/SqueezeboxFab4Applet.lua
(original)
+++
7.6/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeboxFab4/SqueezeboxFab4Applet.lua
Mon Jan 3 15:18:12 2011
@@ -560,7 +560,7 @@
local iface = Networking:activeInterface()
-- After factory reset iface is nil (none selected yet)
- if iface == nil then
+ if iface == nil or not appletManager:callService("isSetupDone") then
return
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
