summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Nielsen Feltzing <linus@haxx.se>2006-08-22 08:33:51 +0000
committerLinus Nielsen Feltzing <linus@haxx.se>2006-08-22 08:33:51 +0000
commit1d1c59e19c687206d51afb03aa8bf6b36815d8a9 (patch)
treeff25ba09a7bbb9cccaebcbb73fa45d640d6bd33d
parentcbcc9db1a845ff8bbc01862f5c250f092152d5a9 (diff)
downloadrockbox-1d1c59e19c687206d51afb03aa8bf6b36815d8a9.zip
rockbox-1d1c59e19c687206d51afb03aa8bf6b36815d8a9.tar.gz
rockbox-1d1c59e19c687206d51afb03aa8bf6b36815d8a9.tar.bz2
rockbox-1d1c59e19c687206d51afb03aa8bf6b36815d8a9.tar.xz
Prevent infinite loop in the X5 keymap, and optimize the yesno context
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10690 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/keymaps/keymap-x5.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/keymaps/keymap-x5.c b/apps/keymaps/keymap-x5.c
index f7480d0..cb5de5b 100644
--- a/apps/keymaps/keymap-x5.c
+++ b/apps/keymaps/keymap-x5.c
@@ -5,6 +5,7 @@
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
* \/ \/ \/ \/ \/
+ * $Id $
*
* Copyright (C) 2006 Jonathan Gordon
*
@@ -109,7 +110,7 @@ const struct button_mapping button_context_tree_scroll_lr[] = {
const struct button_mapping button_context_yesno[] = {
{ ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE },
- LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+ LAST_ITEM_IN_LIST
}; /* button_context_settings_yesno */
const struct button_mapping button_context_quickscreen[] = {
@@ -168,7 +169,7 @@ const struct button_mapping remote_button_context_standard[] = {
{ ACTION_STD_MENU, BUTTON_RC_MENU|BUTTON_REL, BUTTON_RC_MENU },
{ ACTION_STD_QUICKSCREEN,BUTTON_RC_MENU|BUTTON_REPEAT, BUTTON_RC_MENU },
- LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+ LAST_ITEM_IN_LIST
};
const struct button_mapping remote_button_context_tree[] = {