Author: fmueller
Date: Tue Aug 24 00:21:56 2010
New Revision: 9059
URL: http://svn.slimdevices.com/jive?rev=9059&view=rev
Log:
Bug: 16408
Description:
- Do not scan for wireless networks while trying to connect
- Remove non functional code
Modified:
7.6/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupNetworking/SetupNetworkingApplet.lua
Modified:
7.6/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupNetworking/SetupNetworkingApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupNetworking/SetupNetworkingApplet.lua?rev=9059&r1=9058&r2=9059&view=diff
==============================================================================
---
7.6/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupNetworking/SetupNetworkingApplet.lua
(original)
+++
7.6/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupNetworking/SetupNetworkingApplet.lua
Tue Aug 24 00:21:56 2010
@@ -267,24 +267,6 @@
-------- NETWORK SCANNING --------
--- scan menu: update currect SSID
-function _setCurrentSSID(self, ssid)
- if self.currentSSID == ssid then
- return
- end
-
- if self.currentSSID and self.scanResults[self.currentSSID] then
- local item = self.scanResults[self.currentSSID].item
- item.style = nil
- if self.scanMenu then
- self.scanMenu:updatedItem(item)
- end
- end
-
- self.currentSSID = ssid
-end
-
-
-- scan menu: add network
function _addNetwork(self, iface, ssid)
@@ -412,6 +394,11 @@
-- schedule network scan
self.scanMenu:addTimer(5000,
function()
+ -- only scan if this window is on top, not under a
transparent popup
+ if Framework.windowStack[1] ~= window then
+ return
+ end
+
iface:scan(function()
_scanResults(self, iface)
end)
@@ -436,11 +423,8 @@
function _scanResults(self, iface)
- local now = Framework:getTicks()
-
local scanTable = iface:scanResults()
- local associated = self.currentSSID
for ssid, entry in pairs(scanTable) do
-- hide squeezebox ad-hoc networks
if not string.match(ssid,
"logitech[%-%+%*]squeezebox[%-%+%*](%x+)") then
@@ -453,10 +437,6 @@
self.scanResults[ssid].id = entry.id
self.scanResults[ssid].bssid = entry.bssid
self.scanResults[ssid].flags = entry.flags
-
- if entry.associated then
- associated = ssid
- end
local itemStyle
if iface:isWireless() then
@@ -483,9 +463,6 @@
self.scanResults[ssid] = nil
end
end
-
- -- update current ssid
- _setCurrentSSID(self, associated)
end
function _halfDuplexBugTest(self, iface, nextStep, useShowInstead)
@@ -1254,7 +1231,6 @@
end
-- ensure the network state exists
- _setCurrentSSID(self, nil)
if self.scanResults[ssid] == nil then
_addNetwork(self, iface, ssid)
end
@@ -1436,8 +1412,6 @@
log:debug("connection OK ", ssid)
- _setCurrentSSID(self, ssid)
-
-- forget connection state
self.encryption = nil
self.psk = nil
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
