Author: bklaas
Date: Fri Feb 19 08:31:44 2010
New Revision: 8531
URL: http://svn.slimdevices.com/jive?rev=8531&view=rev
Log:
Bug: n/a
Description: when screensaver is set to none, we should not be trying to load
an applet instance
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=8531&r1=8530&r2=8531&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 Feb 19 08:31:44 2010
@@ -252,11 +252,16 @@
-- return
end
- -- activate the screensaver. it should register any windows with
- -- screensaverWindow, and open then itself
- local instance = appletManager:loadApplet(screensaver.applet)
- if instance[screensaver.method](instance, force,
screensaver.methodParam) ~= false then
- log:info("activating " .. screensaver.applet .. " screensaver")
+ if screensaver.applet then
+ -- activate the screensaver. it should register any windows with
+ -- screensaverWindow, and open then itself
+ local instance = appletManager:loadApplet(screensaver.applet)
+ if instance[screensaver.method](instance, force,
screensaver.methodParam) ~= false then
+ log:info("activating " .. screensaver.applet .. "
screensaver")
+ end
+ -- special case for screensaver of NONE
+ else
+ log:info('There is no screensaver applet available for this
mode')
end
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
