Author: mherger
Date: Fri Feb 26 04:50:53 2010
New Revision: 8585
URL: http://svn.slimdevices.com/jive?rev=8585&view=rev
Log:
Fixed Bug: 15787
Description: we need to close error message popup before next image is being
displayed in order to free its memory. Otherwise popups would get stacked in
memory, each consuming some memory.
Modified:
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/ImageViewer/ImageSource.lua
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/ImageViewer/ImageSourceServer.lua
Modified:
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/ImageViewer/ImageSource.lua
URL:
http://svn.slimdevices.com/jive/7.5/trunk/squeezeplay/src/squeezeplay/share/applets/ImageViewer/ImageSource.lua?rev=8585&r1=8584&r2=8585&view=diff
==============================================================================
---
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/ImageViewer/ImageSource.lua
(original)
+++
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/ImageViewer/ImageSource.lua
Fri Feb 26 04:50:53 2010
@@ -51,12 +51,14 @@
popup:addWidget(text)
self.applet:applyScreensaverWindow(popup)
popup:addListener(EVENT_KEY_PRESS | EVENT_MOUSE_PRESS,
- function()
+ function()
popup:playSound("WINDOWHIDE")
popup:hide()
- end)
+ end)
self.applet:tieAndShowWindow(popup)
+
+ return popup
end
function _helpAction(self, window, titleText, bodyText, menu)
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=8585&r1=8584&r2=8585&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
Fri Feb 26 04:50:53 2010
@@ -79,7 +79,12 @@
else
self.imgReady = false
log:warn("readImageList: server ", server, " is not available -
exiting screensaver")
- self:listNotReadyError()
+
+ local popup = self:listNotReadyError()
+ popup:addTimer(self.applet:getSettings()["delay"], function()
+ popup:hide()
+ popup = nil
+ end)
end
end
@@ -293,7 +298,7 @@
end
function listNotReadyError(self)
- self:popupMessage(self.applet:string("IMAGE_VIEWER_ERROR"),
self.applet:string("IMAGE_VIEWER_LIST_NOT_READY_SERVER"))
+ return self:popupMessage(self.applet:string("IMAGE_VIEWER_ERROR"),
self.applet:string("IMAGE_VIEWER_LIST_NOT_READY_SERVER"))
end
--[[
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
