Author: richard
Date: Fri Apr 17 07:39:00 2009
New Revision: 5341
URL: http://svn.slimdevices.com/jive?rev=5341&view=rev
Log:
r5...@harrypotter (orig r5339): tom | 2009-04-17 15:33:35 +0100
Bug: 11284
Description:
- followup fixes:
- missed a nil check for current step
- free() wasn't hiding the step windows properly, does now..
Modified:
7.4/trunk/ (props changed)
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
Propchange: 7.4/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Fri Apr 17 07:39:00 2009
@@ -3,7 +3,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2920
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk:2921
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/private-branches/jive-refresh:3653
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:5290
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:5339
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.4/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
URL:
http://svn.slimdevices.com/jive/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua?rev=5341&r1=5340&r2=5341&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
Fri Apr 17 07:39:00 2009
@@ -303,14 +303,14 @@
end
local currentStep = _getCurrentStep()
- if currentStep.menu then
+ if currentStep and currentStep.menu then
currentStep.menu:lock(
function()
step.cancelled = true
end)
end
step.loaded = function()
- if currentStep.menu then
+ if currentStep and currentStep.menu then
currentStep.menu:unlock()
end
_pushStep(step)
@@ -2909,8 +2909,19 @@
end
-- walk down our path and close...
- while _popStep() do
- _getCurrentStep().window:hide()
+ local currentStep = _getCurrentStep()
+ while currentStep do
+ --hide will trigger POP event which will call _popStep, so
eventually _getCurrentStep() will empty and be nil
+ currentStep.window:hide()
+
+ local candidateCurrentStep = _getCurrentStep()
+ if candidateCurrentStep == currentStep then
+ log:error("POP event should have been handled, popping
the stepStack, but the stepStack pop didn't occur")
+ goHome()
+ return true
+ else
+ currentStep = candidateCurrentStep
+ end
end
if _statusStep then
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
