summaryrefslogtreecommitdiffstats
path: root/apps/shortcuts.c
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2011-11-27 10:10:26 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2011-11-27 10:10:26 +0000
commit6cf7cb9822782295091fb083eab1f2862500b53b (patch)
tree22e08ce8165d541471a98bd705064f6cf9fa9b6d /apps/shortcuts.c
parent47452dcd5c2fcb05b3db738b3a684d0ee713f928 (diff)
downloadrockbox-6cf7cb9822782295091fb083eab1f2862500b53b.tar.gz
rockbox-6cf7cb9822782295091fb083eab1f2862500b53b.tar.bz2
rockbox-6cf7cb9822782295091fb083eab1f2862500b53b.zip
Don't load the icons unless show_icons is actually enabled. And respect that setting in the shortcuts menu
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31069 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/shortcuts.c')
-rw-r--r--apps/shortcuts.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/shortcuts.c b/apps/shortcuts.c
index 3992068807..8ded75c1f2 100644
--- a/apps/shortcuts.c
+++ b/apps/shortcuts.c
@@ -357,7 +357,8 @@ int do_shortcut_menu(void *ignored)
simplelist_info_init(&list, P2STR(ID2P(LANG_SHORTCUTS)), shortcut_count, NULL);
list.get_name = shortcut_menu_get_name;
list.action_callback = shortcut_menu_get_action;
- list.get_icon = shortcut_menu_get_icon;
+ if (global_settings.show_icons)
+ list.get_icon = shortcut_menu_get_icon;
list.title_icon = Icon_Bookmark;
push_current_activity(ACTIVITY_SHORTCUTSMENU);