diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2007-04-17 06:37:22 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2007-04-17 06:37:22 +0000 |
commit | 754d9195f781b7f58970eed650107af01e631b88 (patch) | |
tree | 25a13cdcac3a9008011ba9abe3f7062f946da148 /apps/gui/icon.c | |
parent | 79a8b415132302f7f8762bb31f5ffd2b0858cf7a (diff) | |
download | rockbox-754d9195f781b7f58970eed650107af01e631b88.tar.gz rockbox-754d9195f781b7f58970eed650107af01e631b88.zip |
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
Diffstat (limited to 'apps/gui/icon.c')
-rw-r--r-- | apps/gui/icon.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/apps/gui/icon.c b/apps/gui/icon.c index 8957a5a282..1368c6808e 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, | |||
196 | struct bitmap *bmp = NULL; | 196 | struct bitmap *bmp = NULL; |
197 | int bmpformat = (FORMAT_NATIVE|FORMAT_DITHER); | 197 | int bmpformat = (FORMAT_NATIVE|FORMAT_DITHER); |
198 | 198 | ||
199 | if (!(*filename)) | ||
200 | { | ||
201 | return; | ||
202 | } | ||
203 | |||
204 | switch (iconset) | 199 | switch (iconset) |
205 | { | 200 | { |
206 | case Iconset_Mainscreen: | 201 | case Iconset_Mainscreen: |
@@ -230,7 +225,7 @@ static void load_icons(const char* filename, enum Iconset iconset, | |||
230 | } | 225 | } |
231 | 226 | ||
232 | *loaded_ok = false; | 227 | *loaded_ok = false; |
233 | if (!allow_disable || *filename != '-') | 228 | if (!allow_disable || (filename[0] && filename[0] != '-')) |
234 | { | 229 | { |
235 | char path[MAX_PATH]; | 230 | char path[MAX_PATH]; |
236 | 231 | ||