Author: bklaas
Date: Wed Nov 17 15:26:26 2010
New Revision: 9235
URL: http://svn.slimdevices.com/jive?rev=9235&view=rev
Log:
r48...@daddymac (orig r9234): bklaas | 2010-11-17 17:25:21 -0500
Make sure screensaver table exists before checking screensaver.applet
Modified:
7.6/branches/new-setup/ (props changed)
7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversApplet.lua
Propchange: 7.6/branches/new-setup/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Wed Nov 17 15:26:26 2010
@@ -14,7 +14,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/private-branches/new-alsa:6567
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:8423
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.5/trunk:9219
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.6/trunk:9230
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.6/trunk:9234
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified:
7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversApplet.lua?rev=9235&r1=9234&r2=9235&view=diff
==============================================================================
---
7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversApplet.lua
(original)
+++
7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversApplet.lua
Wed Nov 17 15:26:26 2010
@@ -284,7 +284,7 @@
end
end
- if screensaver.applet then
+ if screensaver and screensaver.applet then
-- activate the screensaver. it should register any windows with
-- screensaverWindow, and open then itself
local instance = appletManager:loadApplet(screensaver.applet)
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
