diff options
Diffstat (limited to 'apps')
-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 a0af666cbb..b640905c0f 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) | |||
153 | else if (menu->flags&MENU_DYNAMIC_DESC) | 153 | else if (menu->flags&MENU_DYNAMIC_DESC) |
154 | menu_icon = menu->menu_get_name_and_icon->icon_id; | 154 | menu_icon = menu->menu_get_name_and_icon->icon_id; |
155 | 155 | ||
156 | #ifdef HAVE_HOTKEY | ||
157 | if (hotkey_settable_menu && (menu->flags&MENU_FUNC_HOTKEYABLE)) | ||
158 | menu_icon = Icon_Hotkey; | ||
159 | #endif | ||
160 | |||
161 | if (menu_icon == Icon_NOICON) | 156 | if (menu_icon == Icon_NOICON) |
162 | { | 157 | { |
163 | switch (menu->flags&MENU_TYPE_MASK) | 158 | switch (menu->flags&MENU_TYPE_MASK) |
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c index 26e6da40e4..1007d2aeb0 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), | |||
442 | MENUITEM_FUNCTION(hotkey_reset, 0, ID2P(LANG_RESET), | 442 | MENUITEM_FUNCTION(hotkey_reset, 0, ID2P(LANG_RESET), |
443 | (int(*)(void))reset_hotkey_settings, NULL, | 443 | (int(*)(void))reset_hotkey_settings, NULL, |
444 | NULL, Icon_NOICON); | 444 | NULL, Icon_NOICON); |
445 | MAKE_MENU(hotkey_menu, ID2P(LANG_HOTKEY), 0, Icon_Hotkey, | 445 | MAKE_MENU(hotkey_menu, ID2P(LANG_HOTKEY), 0, Icon_NOICON, |
446 | &hotkey_view, &hotkey_reset); | 446 | &hotkey_view, &hotkey_reset); |
447 | #endif /*have_hotkey */ | 447 | #endif /*have_hotkey */ |
448 | /* HOTKEY MENU */ | 448 | /* HOTKEY MENU */ |