Author: bklaas
Date: Fri Jan 7 13:43:33 2011
New Revision: 9281
URL: http://svn.slimdevices.com/jive?rev=9281&view=rev
Log:
Bug: 16752
Description: same changes for Fab4 need to also be in for Baby
Modified:
7.6/trunk/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/SetupWelcomeApplet.lua
7.6/trunk/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/SetupWelcomeMeta.lua
7.6/trunk/squeezeplay/src/squeezeplay_baby/share/applets/SqueezeboxBaby/SqueezeboxBabyApplet.lua
Modified:
7.6/trunk/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/SetupWelcomeApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/SetupWelcomeApplet.lua?rev=9281&r1=9280&r2=9281&view=diff
==============================================================================
---
7.6/trunk/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/SetupWelcomeApplet.lua
(original)
+++
7.6/trunk/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/SetupWelcomeApplet.lua
Fri Jan 7 13:43:33 2011
@@ -536,6 +536,13 @@
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_baby/share/applets/SetupWelcome/SetupWelcomeMeta.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/SetupWelcomeMeta.lua?rev=9281&r1=9280&r2=9281&view=diff
==============================================================================
---
7.6/trunk/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/SetupWelcomeMeta.lua
(original)
+++
7.6/trunk/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/SetupWelcomeMeta.lua
Fri Jan 7 13:43:33 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_baby/share/applets/SqueezeboxBaby/SqueezeboxBabyApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay_baby/share/applets/SqueezeboxBaby/SqueezeboxBabyApplet.lua?rev=9281&r1=9280&r2=9281&view=diff
==============================================================================
---
7.6/trunk/squeezeplay/src/squeezeplay_baby/share/applets/SqueezeboxBaby/SqueezeboxBabyApplet.lua
(original)
+++
7.6/trunk/squeezeplay/src/squeezeplay_baby/share/applets/SqueezeboxBaby/SqueezeboxBabyApplet.lua
Fri Jan 7 13:43:33 2011
@@ -746,7 +746,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
Jive-checkins@lists.slimdevices.com
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
