Author: mherger
Date: Tue Feb 16 02:04:06 2010
New Revision: 8505
URL: http://svn.slimdevices.com/jive?rev=8505&view=rev
Log:
Bug: 14326
Description: if download of an image failed, imgReady was never set to true
again. Thus no new image would be requested.
Set imgReady = true and self.image = nil instead. This will cause an error
message to be displayed, but the timer to be reset to download the next image.
Modified:
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/ImageViewer/ImageSourceFlickr.lua
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/ImageViewer/ImageSourceHttp.lua
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/ImageSourceFlickr.lua
URL:
http://svn.slimdevices.com/jive/7.5/trunk/squeezeplay/src/squeezeplay/share/applets/ImageViewer/ImageSourceFlickr.lua?rev=8505&r1=8504&r2=8505&view=diff
==============================================================================
---
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/ImageViewer/ImageSourceFlickr.lua
(original)
+++
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/ImageViewer/ImageSourceFlickr.lua
Tue Feb 16 02:04:06 2010
@@ -157,11 +157,11 @@
if chunk then
local image = Surface:loadImageData(chunk,
#chunk)
self.image = image
- self.imgReady = true
log:debug("image ready")
elseif err then
log:debug("error loading picture")
end
+ self.imgReady = true
end,
'GET', path)
http:fetch(req)
Modified:
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/ImageViewer/ImageSourceHttp.lua
URL:
http://svn.slimdevices.com/jive/7.5/trunk/squeezeplay/src/squeezeplay/share/applets/ImageViewer/ImageSourceHttp.lua?rev=8505&r1=8504&r2=8505&view=diff
==============================================================================
---
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/ImageViewer/ImageSourceHttp.lua
(original)
+++
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/ImageViewer/ImageSourceHttp.lua
Tue Feb 16 02:04:06 2010
@@ -118,11 +118,12 @@
if chunk then
local image = Surface:loadImageData(chunk,
#chunk)
self.image = image
- self.imgReady = true
log:debug("image ready")
- elseif err then
+ elseif err then
+ self.image = nil
log:debug("error loading picture")
end
+ self.imgReady = true
end,
'GET', urlString)
http:fetch(req)
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=8505&r1=8504&r2=8505&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 Feb 16 02:04:06 2010
@@ -231,12 +231,13 @@
if chunk then
local image = Surface:loadImageData(chunk,
#chunk)
self.image = image
- self.imgReady = true
log:debug("image ready")
self:_updateImageDataHistory(imageData)
elseif err then
+ self.image = nil
log:debug("error loading picture")
end
+ self.imgReady = true
end,
'GET', urlString)
http:fetch(req)
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=8505&r1=8504&r2=8505&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 Feb 16 02:04:06 2010
@@ -463,6 +463,9 @@
return EVENT_CONSUME
end)
end
+
+ window:setAllowScreensaver(false)
+
local manager = appletManager:getAppletInstance("ScreenSavers")
manager:screensaverWindow(window, true, {"add", "go", "up", "down",
"back"})
end
@@ -651,7 +654,7 @@
self:displaySlide()
end)
else
- file = self.imgSource:getCurrentImagePath() or 'unknown'
+ local file = self.imgSource:getCurrentImagePath() or 'unknown'
log:info("Invalid image object found: " .. file)
self.imgSource:popupMessage(self:string("IMAGE_VIEWER_INVALID_IMAGE"), file)
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
