devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Fix red

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25876 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jeffrey Goode 2010-05-07 14:53:06 +00:00
parent 32ad1f84ee
commit 2ccb83dd80
2 changed files with 1 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
apps/menu.c
View file

@ -153,11 +153,6 @@ static enum themable_icons menu_get_icon(int selected_item, void * data)
else if (menu->flags&MENU_DYNAMIC_DESC) else if (menu->flags&MENU_DYNAMIC_DESC)
menu_icon = menu->menu_get_name_and_icon->icon_id; 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) if (menu_icon == Icon_NOICON)
{ {
switch (menu->flags&MENU_TYPE_MASK) switch (menu->flags&MENU_TYPE_MASK)

2
apps/menus/settings_menu.c
View file

@ -442,7 +442,7 @@ MENUITEM_FUNCTION(hotkey_view, 0, ID2P(LANG_VIEW_HOTKEY),
MENUITEM_FUNCTION(hotkey_reset, 0, ID2P(LANG_RESET), MENUITEM_FUNCTION(hotkey_reset, 0, ID2P(LANG_RESET),
(int(*)(void))reset_hotkey_settings, NULL, (int(*)(void))reset_hotkey_settings, NULL,
NULL, Icon_NOICON); 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); &hotkey_view, &hotkey_reset);
#endif /*have_hotkey */ #endif /*have_hotkey */
/* HOTKEY MENU */ /* HOTKEY MENU */