diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2011-11-27 10:10:26 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2011-11-27 10:10:26 +0000 |
commit | 6cf7cb9822782295091fb083eab1f2862500b53b (patch) | |
tree | 22e08ce8165d541471a98bd705064f6cf9fa9b6d /apps/shortcuts.c | |
parent | 47452dcd5c2fcb05b3db738b3a684d0ee713f928 (diff) | |
download | rockbox-6cf7cb9822782295091fb083eab1f2862500b53b.tar.gz 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.c | 3 |
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) | |||
357 | simplelist_info_init(&list, P2STR(ID2P(LANG_SHORTCUTS)), shortcut_count, NULL); | 357 | simplelist_info_init(&list, P2STR(ID2P(LANG_SHORTCUTS)), shortcut_count, NULL); |
358 | list.get_name = shortcut_menu_get_name; | 358 | list.get_name = shortcut_menu_get_name; |
359 | list.action_callback = shortcut_menu_get_action; | 359 | list.action_callback = shortcut_menu_get_action; |
360 | list.get_icon = shortcut_menu_get_icon; | 360 | if (global_settings.show_icons) |
361 | list.get_icon = shortcut_menu_get_icon; | ||
361 | list.title_icon = Icon_Bookmark; | 362 | list.title_icon = Icon_Bookmark; |
362 | 363 | ||
363 | push_current_activity(ACTIVITY_SHORTCUTSMENU); | 364 | push_current_activity(ACTIVITY_SHORTCUTSMENU); |