Author: titmuss
Date: Mon Feb 4 15:34:38 2008
New Revision: 1799
URL: http://svn.slimdevices.com?rev=1799&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r1789): titmuss | 2008-02-04 19:51:50 +0000
Bug: 6918
Description:
Remove all code using .origin. It looks like this is historic and not used
now. In some situations this could also lead to
an infinate loop in SlimBrowser:free(), causing a watchdog reset on the
hardware.
Modified:
trunk/ (props changed)
trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua
Propchange: trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Mon Feb 4 15:34:38 2008
@@ -1,3 +1,3 @@
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1788
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1789
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified:
trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua?rev=1799&root=Jive&r1=1798&r2=1799&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua
(original)
+++ trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua Mon
Feb 4 15:34:38 2008
@@ -1549,10 +1549,6 @@
-- cancel the step to prevent new data being loaded
step.cancelled = true
-
- if _curStep and _curStep.origin then
- _curStep = _curStep.origin
- end
end
)
@@ -1716,7 +1712,6 @@
if _statusStep then
-- arrange so that menuListener works
- _statusStep.origin = _curStep
_curStep = _statusStep
-- current playlist should select currently playing item
@@ -2154,20 +2149,7 @@
_server = false
_string = false
- -- walk down our path and close...
- local step = _curStep
-
- while step do
- step.window:hide()
- step = step.origin
- end
-
- local step = _statusStep
-
- while step do
- step.window:hide()
- step = step.origin
- end
+ log:info("done SlimBrowserApplet:free()")
return true
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
