explicitly set *loaded_ok = false; when given "" for a filename.

remove icon_init from the startup sequence, its not dependant on filetypes_init anymore,settings_apply calls the icons_init (causes the bmp's to only be read once on boot instead of twice)


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13191 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 1 insertions, 8 deletions

diff --git a/apps/gui/icon.c b/apps/gui/icon.c
index 8957a5a..1368c68 100644
--- a/apps/gui/icon.c
+++ b/apps/gui/icon.c
@@ -196,11 +196,6 @@ static void load_icons(const char* filename, enum Iconset iconset,
     struct bitmap *bmp = NULL;
     int bmpformat = (FORMAT_NATIVE|FORMAT_DITHER);
     
-    if (!(*filename))
-    {
-        return;
-    }
-    
     switch (iconset)
     {
         case Iconset_Mainscreen:
@@ -230,7 +225,7 @@ static void load_icons(const char* filename, enum Iconset iconset,
     }
     
     *loaded_ok = false;
-    if (!allow_disable || *filename != '-')
+    if (!allow_disable || (filename[0] && filename[0] != '-'))
     {
         char path[MAX_PATH];
         
diff --git a/apps/main.c b/apps/main.c
index 7590382..68f5588 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -268,7 +268,6 @@ static void init(void)
     sleep(HZ/2);
     tree_init();
     filetype_init();
-    icons_init();
     playlist_init();
 
 #if CONFIG_CODEC != SWCODEC
@@ -503,7 +502,6 @@ static void init(void)
     playlist_init();
     tree_init();
     filetype_init();
-    icons_init();
     scrobbler_init();
     cuesheet_init();