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

apps/gui/icon.c

@@ -236,6 +236,8 @@ void icons_init(void)
         }
     }
 
+    if (global_settings.show_icons)
+    {
         load_icons(global_settings.icon_file, Iconset_user, SCREEN_MAIN);
 
         if (global_settings.viewers_icon_file[0] &&
@@ -267,6 +269,7 @@ void icons_init(void)
         }
 #endif
     }
+}
 
 int get_icon_width(enum screen_type screen_type)
 {

apps/menus/theme_menu.c

@@ -39,6 +39,7 @@
 #include "viewport.h"
 #include "statusbar-skinned.h"
 #include "skin_engine/skin_engine.h"
+#include "icons.h"
 
 #ifdef HAVE_BACKDROP_IMAGE
 /**
@@ -356,7 +357,25 @@ MENUITEM_FUNCTION(browse_rfms, MENU_FUNC_USEPARAM,
 #endif
 #endif
 
-MENUITEM_SETTING(show_icons, &global_settings.show_icons, NULL);
+
+static int showicons_callback(int action, const struct menu_item_ex *this_item)
+{
+    (void)this_item;
+    static bool old_icons;
+    switch (action)
+    {
+        case ACTION_ENTER_MENUITEM:
+            old_icons = global_settings.show_icons;
+            break;
+        case ACTION_EXIT_MENUITEM:
+            if (old_icons != global_settings.show_icons)
+                icons_init();
+            break;
+    }
+    return ACTION_REDRAW;
+}
+
+MENUITEM_SETTING(show_icons, &global_settings.show_icons, showicons_callback);
 MENUITEM_FUNCTION(browse_themes, MENU_FUNC_USEPARAM, 
         ID2P(LANG_CUSTOM_THEME), 
         browse_folder, (void*)&themes, NULL, Icon_Config);

apps/shortcuts.c

@@ -357,6 +357,7 @@ 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;
+    if (global_settings.show_icons)
         list.get_icon = shortcut_menu_get_icon;
     list.title_icon = Icon_Bookmark;