summaryrefslogtreecommitdiff
path: root/apps/tree.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/tree.c
parentb9aabcb1a40aa2705d720e332bef7c390fb0587a (diff)
downloadrockbox-e425371e10c5c18a1996fe7adfb4184a09ebbd8a.zip
rockbox-e425371e10c5c18a1996fe7adfb4184a09ebbd8a.tar.gz
rockbox-e425371e10c5c18a1996fe7adfb4184a09ebbd8a.tar.bz2
rockbox-e425371e10c5c18a1996fe7adfb4184a09ebbd8a.tar.xz
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/tree.c')
-rw-r--r--apps/tree.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/tree.c b/apps/tree.c
index 55d3bac..5a8445c 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -295,7 +295,8 @@ void tree_gui_init(void)
#endif
gui_synclist_init(&tree_lists, &tree_get_filename, &tc, false, 1, NULL);
gui_synclist_set_voice_callback(&tree_lists, tree_voice_cb);
- gui_synclist_set_icon_callback(&tree_lists, &tree_get_fileicon);
+ gui_synclist_set_icon_callback(&tree_lists,
+ global_settings.show_icons?&tree_get_fileicon:NULL);
#ifdef HAVE_LCD_COLOR
gui_synclist_set_color_callback(&tree_lists, &tree_get_filecolor);
#endif
@@ -456,7 +457,8 @@ static int update_dir(void)
}
gui_synclist_set_nb_items(&tree_lists, tc.filesindir);
- gui_synclist_set_icon_callback(&tree_lists, tree_get_fileicon);
+ gui_synclist_set_icon_callback(&tree_lists,
+ global_settings.show_icons?tree_get_fileicon:NULL);
if( tc.selected_item >= tc.filesindir)
tc.selected_item=tc.filesindir-1;