diff options
| author | Marianne Arnold <pixelma@rockbox.org> | 2009-05-18 21:30:06 +0000 |
|---|---|---|
| committer | Marianne Arnold <pixelma@rockbox.org> | 2009-05-18 21:30:06 +0000 |
| commit | f772673572f655fed0228d29452cf5b2e8696c77 (patch) | |
| tree | 19432671e1d05777a96a2c86dc68f6e8865cb37d /apps | |
| parent | e631d1fb28f25ff05522263c44fa9c347cd63883 (diff) | |
Rockblox: make sure the new restart combo on Player and Ondio does not interfere with the usual 'quit', even when pressing the Stop (or Off) button first.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20984 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/plugins/rockblox.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c index 85fbf1f5a6..7aaf26fe03 100644 --- a/apps/plugins/rockblox.c +++ b/apps/plugins/rockblox.c @@ -79,7 +79,8 @@ PLUGIN_HEADER #elif CONFIG_KEYPAD == PLAYER_PAD -#define ROCKBLOX_OFF BUTTON_STOP +#define ROCKBLOX_OFF_PRE BUTTON_STOP +#define ROCKBLOX_OFF (BUTTON_STOP|BUTTON_REL) #define ROCKBLOX_ROTATE_RIGHT BUTTON_PLAY #define ROCKBLOX_ROTATE_LEFT (BUTTON_ON|BUTTON_PLAY) #define ROCKBLOX_DOWN BUTTON_MENU @@ -91,7 +92,8 @@ PLUGIN_HEADER #elif CONFIG_KEYPAD == ONDIO_PAD -#define ROCKBLOX_OFF BUTTON_OFF +#define ROCKBLOX_OFF_PRE BUTTON_OFF +#define ROCKBLOX_OFF (BUTTON_OFF|BUTTON_REL) #define ROCKBLOX_ROTATE_RIGHT BUTTON_UP #define ROCKBLOX_ROTATE_LEFT (BUTTON_MENU|BUTTON_UP) #define ROCKBLOX_DOWN BUTTON_DOWN @@ -1193,6 +1195,10 @@ static int rockblox_loop (void) case ROCKBLOX_RC_OFF: #endif case ROCKBLOX_OFF: +#ifdef ROCKBLOX_OFF_PRE + if (lastbutton != ROCKBLOX_OFF_PRE) + break; +#endif return PLUGIN_OK; #if defined(ROCKBLOX_ROTATE) |