Author: bklaas
Date: Tue Mar 8 09:11:43 2011
New Revision: 9348
URL: http://svn.slimdevices.com/jive?rev=9348&view=rev
Log:
Bug: 17009
Description: never drill into a _getCurrentStep() object before knowing if
_getCurrentStep() exists
Modified:
7.5/branches/7.5.3bugfix/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
Modified:
7.5/branches/7.5.3bugfix/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
URL:
http://svn.slimdevices.com/jive/7.5/branches/7.5.3bugfix/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua?rev=9348&r1=9347&r2=9348&view=diff
==============================================================================
---
7.5/branches/7.5.3bugfix/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
(original)
+++
7.5/branches/7.5.3bugfix/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
Tue Mar 8 09:11:43 2011
@@ -2098,7 +2098,7 @@
-- these may work without an item
-- Note the assumption here: event handling happens for front window
only
- if _getCurrentStep().actionModifier then
+ if _getCurrentStep() and _getCurrentStep().actionModifier then
local builtInAction = actionName ..
_getCurrentStep().actionModifier
local func = _defaultActions[builtInAction]
@@ -2236,7 +2236,7 @@
-- we don't care about events not on the current window
-- assumption for event handling code: _curStep corresponds to current
window!
- if _getCurrentStep().menu != menu then
+ if _getCurrentStep() and _getCurrentStep().menu != menu then
log:debug("_getCurrentStep(): ", _getCurrentStep())
log:error("Ignoring, not visible, or step/windowStack out of
sync: current step menu: ", _getCurrentStep().menu, " window menu: ", menu)
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
