diff options
| author | Jeffrey Goode <jeffg7@gmail.com> | 2010-05-07 14:53:06 +0000 |
|---|---|---|
| committer | Jeffrey Goode <jeffg7@gmail.com> | 2010-05-07 14:53:06 +0000 |
| commit | 2ccb83dd80292de08164ed193f51319925d16a1d (patch) | |
| tree | 21aa6f30f7ab760fc32c0f4eaa62a2fbf48580ac | |
| parent | 32ad1f84ee0e4e60812a142eb9b001a1ee87b130 (diff) | |
| download | rockbox-2ccb83dd80292de08164ed193f51319925d16a1d.zip rockbox-2ccb83dd80292de08164ed193f51319925d16a1d.tar.gz rockbox-2ccb83dd80292de08164ed193f51319925d16a1d.tar.bz2 rockbox-2ccb83dd80292de08164ed193f51319925d16a1d.tar.xz | |
Fix red
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25876 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/menu.c | 5 | ||||
| -rw-r--r-- | apps/menus/settings_menu.c | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/apps/menu.c b/apps/menu.c index a0af666..b640905 100644 --- a/apps/menu.c +++ b/apps/menu.c @@ -153,11 +153,6 @@ static enum themable_icons menu_get_icon(int selected_item, void * data) else if (menu->flags&MENU_DYNAMIC_DESC) menu_icon = menu->menu_get_name_and_icon->icon_id; -#ifdef HAVE_HOTKEY - if (hotkey_settable_menu && (menu->flags&MENU_FUNC_HOTKEYABLE)) - menu_icon = Icon_Hotkey; -#endif - if (menu_icon == Icon_NOICON) { switch (menu->flags&MENU_TYPE_MASK) diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c index 26e6da4..1007d2a 100644 --- a/apps/menus/settings_menu.c +++ b/apps/menus/settings_menu.c @@ -442,7 +442,7 @@ MENUITEM_FUNCTION(hotkey_view, 0, ID2P(LANG_VIEW_HOTKEY), MENUITEM_FUNCTION(hotkey_reset, 0, ID2P(LANG_RESET), (int(*)(void))reset_hotkey_settings, NULL, NULL, Icon_NOICON); -MAKE_MENU(hotkey_menu, ID2P(LANG_HOTKEY), 0, Icon_Hotkey, +MAKE_MENU(hotkey_menu, ID2P(LANG_HOTKEY), 0, Icon_NOICON, &hotkey_view, &hotkey_reset); #endif /*have_hotkey */ /* HOTKEY MENU */ |