Author: mherger
Date: Tue Mar 2 23:04:00 2010
New Revision: 8618
URL: http://svn.slimdevices.com/jive?rev=8618&view=rev
Log:
Bug: 14326
Description:
- add specific error when server doesn't return a valid image list
- fix crasher in error message display...
- hide error message to continue slide show if possible
Modified:
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/ImageViewer/ImageSourceServer.lua
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/ImageViewer/ImageViewerApplet.lua
Modified:
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/ImageViewer/ImageSourceServer.lua
URL:
http://svn.slimdevices.com/jive/7.5/trunk/squeezeplay/src/squeezeplay/share/applets/ImageViewer/ImageSourceServer.lua?rev=8618&r1=8617&r2=8618&view=diff
==============================================================================
---
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/ImageViewer/ImageSourceServer.lua
(original)
+++
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/ImageViewer/ImageSourceServer.lua
Tue Mar 2 23:04:00 2010
@@ -78,7 +78,8 @@
)
else
self.imgReady = false
- log:warn("readImageList: server ", server, " is not available -
exiting screensaver")
+ log:warn("readImageList: server ", server, " is not available")
+ self.error =
self.applet:string("IMAGE_VIEWER_LIST_NOT_READY_SERVER")
local popup = self:listNotReadyError()
popup:addTimer(self.applet:getSettings()["delay"], function()
@@ -294,7 +295,7 @@
end
function getErrorMessage(self)
- return self.error or
oo.superclass(ImageSourceServer):getErrorMessage(self)
+ return self.error or self.applet:string("IMAGE_VIEWER_HTTP_ERROR_IMAGE")
end
function listNotReadyError(self)
Modified:
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/ImageViewer/ImageViewerApplet.lua
URL:
http://svn.slimdevices.com/jive/7.5/trunk/squeezeplay/src/squeezeplay/share/applets/ImageViewer/ImageViewerApplet.lua?rev=8618&r1=8617&r2=8618&view=diff
==============================================================================
---
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/ImageViewer/ImageViewerApplet.lua
(original)
+++
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/ImageViewer/ImageViewerApplet.lua
Tue Mar 2 23:04:00 2010
@@ -717,7 +717,11 @@
self.imageError =
tostring(self.imgSource:getErrorMessage())
log:error("Invalid image object found: " ..
self.imageError)
-
self.imgSource:popupMessage(self:string("IMAGE_VIEWER_INVALID_IMAGE"),
self.imageError)
+ local popup =
self.imgSource:popupMessage(self:string("IMAGE_VIEWER_INVALID_IMAGE"),
self.imageError)
+ popup:addTimer(self:getSettings()["delay"], function()
+ popup:hide()
+ popup = nil
+ end)
end
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
