Author: titmuss
Date: Wed Feb 13 09:29:12 2008
New Revision: 1940
URL: http://svn.slimdevices.com?rev=1940&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r1926): bklaas | 2008-02-13 17:00:01 +0000
Bug: 7113
Description: fix suspend for when wireless is not connected
Modified:
trunk/ (props changed)
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
Propchange: trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Wed Feb 13 09:29:12 2008
@@ -1,3 +1,3 @@
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1925
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1926
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified:
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua?rev=1940&root=Jive&r1=1939&r2=1940&view=diff
==============================================================================
---
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
(original)
+++
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
Wed Feb 13 09:29:12 2008
@@ -913,7 +913,9 @@
function _suspendTask(self)
-- check existing network config
local status = self.wireless:t_wpaStatus()
- local zeroconf = string.match(status.ip_address, "^169.254.") ~= nil
+ local wirelessWasConnected = (status.wpa_state == 'COMPLETED')
+
+ local zeroconf = status.ip_address and string.match(status.ip_address,
"^169.254.") ~= nil
local settings = self:getSettings()
local wakeAfter = settings.suspendWake and settings.suspendWake or ""
@@ -936,11 +938,19 @@
local status = self.wireless:t_wpaStatus()
-- network connected?
- log:info("resume ip=", status.ip_address, " zeroconf=",
zeroconf)
- if status.wpa_state == "COMPLETED" and status.ip_address and
(not string.match(status.ip_address, "^169.254.") or zeroconf) then
+ log:info('Wireless was connected: ', wirelessWasConnected)
+ if status then
+ log:info('wpa_state=', status.wpa_state)
+ log:info("resume ip=", status.ip_address, " zeroconf=",
zeroconf)
+ end
+
+ if not wirelessWasConnected and status and status.wpa_state
+ or (status.wpa_state == "COMPLETED" and
status.ip_address and (not string.match(status.ip_address, "^169.254.") or
zeroconf)) then
-- force reconnections
- jnt:notify("networkConnected")
+ if wirelessWasConnected then
+ jnt:notify("networkConnected")
+ end
-- close popup
self.suspendPopup:hide()
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
