Author: titmuss
Date: Fri Jan 18 06:13:56 2008
New Revision: 1499
URL: http://svn.slimdevices.com?rev=1499&root=Jive&view=rev
Log:
Bug: N/A
Description:
Fix Ray setup on the hardware.
Modified:
trunk/jive/src/pkg/jive/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua
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=1499&root=Jive&r1=1498&r2=1499&view=diff
==============================================================================
---
trunk/jive/src/pkg/jive/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua
(original)
+++
trunk/jive/src/pkg/jive/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua
Fri Jan 18 06:13:56 2008
@@ -71,6 +71,7 @@
function free(self)
+ log:warn("## removing udap sink")
self.udap:removeSink(self.udapSink)
end
@@ -92,7 +93,7 @@
-- note we keep old entries so this list the window is not empty
-- during initial setup. if this becomes a problem a "finding
-- squeezeboxen" screen will need to be added.
- if self.hasWireless then
+ if hasWireless then
self:_scanComplete(self.wireless:scanResults(), keepOldEntries)
-- find jive network configuration
@@ -155,7 +156,7 @@
function _scan(self)
- if self.hasWireless then
+ if hasWireless then
self.wireless:scan(function(scanTable)
_scanComplete(self, scanTable)
end)
@@ -284,8 +285,7 @@
if adhoc then
-- full configuration via adhoc network
- local hasEthernet = self:ssidIsSqueezebox(adhoc)[1]
- assert(hasEthernet)
+ local _, hasEthernet = self:ssidIsSqueezebox(adhoc)
_setupInit(self, mac, hasEthernet)
_setupConfig(self)
@@ -301,7 +301,7 @@
end
-- remove squeezebox from scan results
- if self.scanMenu then
+ if self.scanResults and self.scanResults[mac] then
self.scanMenu:removeItem(self.scanResults[mac].item)
self.scanResults[mac] = nil
end
@@ -1123,7 +1123,7 @@
_scanSlimservers(self)
end)
- window:show()
+ self:tieAndShowWindow(window)
-- SqueezeNetwork will always be one entry, so wait until we have
-- two or more
@@ -1399,7 +1399,7 @@
end)
- window:show()
+ self:tieAndShowWindow(window)
end
@@ -1443,7 +1443,7 @@
window:addWidget(help)
window:addWidget(menu)
- window:show()
+ self:tieAndShowWindow(window)
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
