summaryrefslogtreecommitdiff
path: root/apps/menu.c
diff options
context:
space:
mode:
Diffstat (limited to 'apps/menu.c')
-rw-r--r--apps/menu.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/apps/menu.c b/apps/menu.c
index 8656c903c7..c4b9317e6c 100644
--- a/apps/menu.c
+++ b/apps/menu.c
@@ -415,20 +415,16 @@ static void init_menu_lists(const struct menu_item_ex *menu,
415 415
416 gui_synclist_init(lists,get_menu_item_name,(void*)menu,false,1); 416 gui_synclist_init(lists,get_menu_item_name,(void*)menu,false,1);
417#ifdef HAVE_LCD_BITMAP 417#ifdef HAVE_LCD_BITMAP
418 if (global_settings.show_icons == false) 418 if (menu->callback_and_desc->icon == NOICON)
419 icon = NOICON;
420 else if (menu->callback_and_desc->icon == NOICON)
421 icon = bitmap_icons_6x8[Icon_Submenu_Entered]; 419 icon = bitmap_icons_6x8[Icon_Submenu_Entered];
422 else 420 else
423 icon = menu->callback_and_desc->icon; 421 icon = menu->callback_and_desc->icon;
424 gui_synclist_set_title(lists, P2STR(menu->callback_and_desc->desc), icon); 422 gui_synclist_set_title(lists, P2STR(menu->callback_and_desc->desc), icon);
425 if (global_settings.show_icons) 423 gui_synclist_set_icon_callback(lists, menu_get_icon);
426 gui_synclist_set_icon_callback(lists, menu_get_icon);
427 else
428#else 424#else
429 (void)icon; 425 (void)icon;
426 gui_synclist_set_icon_callback(lists, NULL);
430#endif 427#endif
431 gui_synclist_set_icon_callback(lists, NULL);
432 gui_synclist_set_nb_items(lists,current_subitems_count); 428 gui_synclist_set_nb_items(lists,current_subitems_count);
433 gui_synclist_limit_scroll(lists,true); 429 gui_synclist_limit_scroll(lists,true);
434 gui_synclist_select_item(lists, find_menu_selection(selected)); 430 gui_synclist_select_item(lists, find_menu_selection(selected));