Author: bklaas
Date: Fri Apr 23 07:56:59 2010
New Revision: 8726
URL: http://svn.slimdevices.com/jive?rev=8726&view=rev
Log:
Fixed Bug: 16023
Bug: 14986
Description: only ignore the _activate() screensaver method to fulfill bug
14986 if the_screensaver is the same as the currently running screensaver
I've tested this as correctly fixing bug 16023, and attempted to test that
14986 still works as desired. AFAICT, bug 14986 is still fixed, but I could use
some independent verification of that one.
Modified:
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversApplet.lua
Modified:
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversApplet.lua
URL:
http://svn.slimdevices.com/jive/7.5/trunk/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversApplet.lua?rev=8726&r1=8725&r2=8726&view=diff
==============================================================================
---
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversApplet.lua
(original)
+++
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversApplet.lua
Fri Apr 23 07:56:59 2010
@@ -226,11 +226,12 @@
function _activate(self, the_screensaver, force)
log:debug("Screensaver activate")
- -- In some situations the timer restart below tries to activate an SS
when one is already running.
+ -- In some situations the timer restart below tries to activate a SS
when the same one is already running.
-- Example: Blank SS for soft power off while in Diagnostics (i.e. an
applet not allowing SS).
-- This causes the backlight to turn on again after 10 seconds. #14986
- if self:isScreensaverActive() then
- log:warn("A screensaver is already active - ignoring activate
request.")
+ local currentScreensaver = self.active and self.active[1]
+ if self:isScreensaverActive() and the_screensaver == currentScreensaver
then
+ log:warn("This screensaver is already active - ignoring
activate request.")
return
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
