Author: richard
Date: Thu May 28 10:35:16 2009
New Revision: 5922
URL: http://svn.slimdevices.com/jive?rev=5922&view=rev
Log:
Bug: 12048
Description:
Don't show "Please wait" indefinitely, time out after 90 seconds.
Modified:
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
Modified:
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
URL:
http://svn.slimdevices.com/jive/7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua?rev=5922&r1=5921&r2=5922&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
Thu May 28 10:35:16 2009
@@ -1159,6 +1159,8 @@
-- wake up power state
self:wakeup('motion')
+ local t0 = Framework:getTicks()
+
while true do
local status = self.wireless:t_wpaStatus()
@@ -1194,6 +1196,23 @@
return
end
+
+ local t1 = Framework:getTicks()
+ if (t1 - t0) > 90000 then
+ log:info("failed to connect")
+
+ -- restart discovery
+ appletManager:callService("connectPlayer")
+
+ -- close popup
+ self.suspendPopup:hide()
+
+ self.suspendPopup = nil
+ self.suspendTask = nil
+
+ return
+ end
+
Task:yield(false)
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
