summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2006-11-18 13:42:09 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2006-11-18 13:42:09 +0000
commit65e0a0c934b7d07e588cf8034dbec80333540930 (patch)
tree2296e1a842012e128780744df28ccff3bc262eb5 /apps
parent73e31d1af363905af315c9570a74744153f02c5c (diff)
fix bubbles for good this time.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11547 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rwxr-xr-xapps/plugins/bubbles.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/apps/plugins/bubbles.c b/apps/plugins/bubbles.c
index 254539603f..2ff145b5f7 100755
--- a/apps/plugins/bubbles.c
+++ b/apps/plugins/bubbles.c
@@ -2338,8 +2338,10 @@ static int bubbles_handlebuttons(struct game_context* bb, bool animblock,
long start;
const struct button_mapping *plugin_contexts[]
= {generic_left_right_fire,generic_actions};
- button = pluginlib_getaction(rb,timeout,plugin_contexts,2);
+ if (timeout < 0)
+ timeout = 0;
+ button = pluginlib_getaction(rb,timeout,plugin_contexts,2);
#ifdef HAS_BUTTON_HOLD
if (rb->button_hold())
button = BUBBLES_START;
@@ -2390,7 +2392,8 @@ static int bubbles_handlebuttons(struct game_context* bb, bool animblock,
case BUBBLES_QUIT: /* end the game */
return BB_END;
- case ACTION_UNKNOWN: /* no button pressed */
+ case ACTION_UNKNOWN:
+ case ACTION_NONE: /* no button pressed */
break;
default: