Author: titmuss
Date: Wed Jul 2 02:54:05 2008
New Revision: 2651
URL: http://svn.slimdevices.com?rev=2651&root=Jive&view=rev
Log:
Bug: 6641
Description:
As per the orignal request don't dim the screen during firmware upgrades. When
a window
disables power save mode then the power state now remains active.
Modified:
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
Modified:
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua?rev=2651&root=Jive&r1=2650&r2=2651&view=diff
==============================================================================
---
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
(original)
+++
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
Wed Jul 2 02:54:05 2008
@@ -547,18 +547,20 @@
-- called to sleep jive
function sleep(self)
- if self.powerState == "active" then
+ -- don't sleep or suspend with a popup visible
+ -- e.g. Bug 6641 during a firmware upgrade
+ local topWindow = Framework.windowStack[1]
+ if not topWindow:canActivatePowersave()then
+ self:setPowerState("active")
+
+ elseif self.powerState == "active" then
self:setPowerState("dimmed")
+
elseif self.powerState == "locked" then
self:setPowerState("sleep")
+
else
- -- don't sleep or suspend with a popup visible
- -- e.g. Bug 6641 during a firmware upgrade
- local topWindow = Framework.windowStack[1]
- if not topWindow:canActivatePowersave()then
- self:setPowerState("dimmed")
-
- elseif self.powerState == "dimmed" then
+ if self.powerState == "dimmed" then
self:setPowerState("sleep")
elseif self.powerState == "sleep" then
self:setPowerState("suspend")
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
