Author: tom
Date: Thu Feb 19 07:08:51 2009
New Revision: 4305
URL: http://svn.slimdevices.com/jive?rev=4305&view=rev
Log:
Bug: N/A
Description:
- pushAction crashed trying to send nil to pushEvent. Rverted last change,
pushed down to a more complete C side fix instead
Modified:
7.4/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Framework.lua
7.4/trunk/squeezeplay/src/squeezeplay/src/ui/jive_framework.c
Modified: 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Framework.lua
URL:
http://svn.slimdevices.com/jive/7.4/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Framework.lua?rev=4305&r1=4304&r2=4305&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Framework.lua (original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Framework.lua Thu Feb
19 07:08:51 2009
@@ -616,10 +616,7 @@
=cut
--]]
function pushAction(self, actionName)
- local actionEvent = self:newActionEvent(actionName)
- if actionEvent then
- self:pushEvent(actionEvent)
- end
+ self:pushEvent(self:newActionEvent(actionName))
end
Modified: 7.4/trunk/squeezeplay/src/squeezeplay/src/ui/jive_framework.c
URL:
http://svn.slimdevices.com/jive/7.4/trunk/squeezeplay/src/squeezeplay/src/ui/jive_framework.c?rev=4305&r1=4304&r2=4305&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/src/ui/jive_framework.c (original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/src/ui/jive_framework.c Thu Feb 19
07:08:51 2009
@@ -780,7 +780,13 @@
* 2: JiveEvent
*/
- JiveEvent *evt = lua_touserdata(L, 2);
+ JiveEvent *evt;
+ if (lua_isnil(L, 2)) {
+ //nothing to do when no event is passed in
+ return 0;
+ }
+
+ evt = lua_touserdata(L, 2);
jive_queue_event(evt);
return 0;
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
