summaryrefslogtreecommitdiffstats
path: root/apps/menu.c
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2009-12-16 08:36:46 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2009-12-16 08:36:46 +0000
commite425371e10c5c18a1996fe7adfb4184a09ebbd8a (patch)
tree80bee7b66110bd31734897a96fe336ea50336923 /apps/menu.c
parentb9aabcb1a40aa2705d720e332bef7c390fb0587a (diff)
downloadrockbox-e425371e10c5c18a1996fe7adfb4184a09ebbd8a.tar.gz
rockbox-e425371e10c5c18a1996fe7adfb4184a09ebbd8a.tar.bz2
rockbox-e425371e10c5c18a1996fe7adfb4184a09ebbd8a.zip
Fix FS#10289 - screens showing a list need to check the show_icons setting before setting the callback. the List will now always draw icons if a callback is set (like its always done for voice)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24022 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/menu.c')
-rw-r--r--apps/menu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/menu.c b/apps/menu.c
index 536b14b7d1..fe5764b29c 100644
--- a/apps/menu.c
+++ b/apps/menu.c
@@ -209,7 +209,7 @@ static void init_menu_lists(const struct menu_item_ex *menu,
else
icon = menu->callback_and_desc->icon_id;
gui_synclist_set_title(lists, P2STR(menu->callback_and_desc->desc), icon);
- gui_synclist_set_icon_callback(lists, menu_get_icon);
+ gui_synclist_set_icon_callback(lists, global_settings.show_icons?menu_get_icon:NULL);
#else
(void)icon;
gui_synclist_set_icon_callback(lists, NULL);