Author: richard
Date: Thu Feb 19 08:14:10 2009
New Revision: 4307
URL: http://svn.slimdevices.com/jive?rev=4307&view=rev
Log:
r4...@harrypotter (orig r4302): tom | 2009-02-19 14:31:03 +0000
Bug: N/A
Description:
- pushAction crashed trying to send nil to pushEvent
r4...@harrypotter (orig r4305): tom | 2009-02-19 15:08:51 +0000
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
r4...@harrypotter (orig r4306): tom | 2009-02-19 15:16:35 +0000
Bug: N/A
Description:
- lowered "up buffer zone", seemed too far
Modified:
7.4/branches/pango/ (props changed)
7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/ui/Button.lua
7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/jive_framework.c
Propchange: 7.4/branches/pango/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Thu Feb 19 08:14:10 2009
@@ -4,7 +4,7 @@
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:4138
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:4292
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:4306
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/branches/pango/squeezeplay/src/squeezeplay/share/jive/ui/Button.lua
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/ui/Button.lua?rev=4307&r1=4306&r2=4307&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/ui/Button.lua
(original)
+++ 7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/ui/Button.lua Thu
Feb 19 08:14:10 2009
@@ -19,7 +19,7 @@
local EVENT_UNUSED = jive.ui.EVENT_UNUSED
-local BUFFER_DISTANCE = 75
+local BUFFER_DISTANCE = 30
local HOLD_TIMEOUT = 1000
Modified: 7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/jive_framework.c
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/jive_framework.c?rev=4307&r1=4306&r2=4307&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/jive_framework.c
(original)
+++ 7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/jive_framework.c Thu
Feb 19 08:14:10 2009
@@ -799,7 +799,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
