diff options
author | Björn Stenberg <bjorn@haxx.se> | 2002-10-09 08:51:08 +0000 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2002-10-09 08:51:08 +0000 |
commit | 746501f552b2aebe113ba2116f5beb03494ae9cb (patch) | |
tree | 66470c16c50b30053ab43923b6210be0925b7d83 /apps | |
parent | cdf9f6b84bbd8c7a6ea34436bbb16e592f8a5205 (diff) | |
download | rockbox-746501f552b2aebe113ba2116f5beb03494ae9cb.tar.gz rockbox-746501f552b2aebe113ba2116f5beb03494ae9cb.zip |
Don't try to load files if setting is empty
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2543 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/settings.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/apps/settings.c b/apps/settings.c index f03c1e888b..eb4409c805 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -377,19 +377,22 @@ void settings_apply(void) | |||
377 | charge_restart_level = global_settings.discharge ? CHARGE_RESTART_LO : CHARGE_RESTART_HI; | 377 | charge_restart_level = global_settings.discharge ? CHARGE_RESTART_LO : CHARGE_RESTART_HI; |
378 | #endif | 378 | #endif |
379 | 379 | ||
380 | if ( global_settings.wps_file[0] ) { | 380 | if ( global_settings.wps_file[0] && |
381 | global_settings.wps_file[0] != 0xff ) { | ||
381 | snprintf(buf, sizeof buf, ROCKBOX_DIR "/%s.wps", | 382 | snprintf(buf, sizeof buf, ROCKBOX_DIR "/%s.wps", |
382 | global_settings.wps_file); | 383 | global_settings.wps_file); |
383 | wps_load(buf, false); | 384 | wps_load(buf, false); |
384 | } | 385 | } |
385 | #ifdef HAVE_LCD_BITMAP | 386 | #ifdef HAVE_LCD_BITMAP |
386 | if ( global_settings.font_file[0] ) { | 387 | if ( global_settings.font_file[0] && |
388 | global_settings.font_file[0] != 0xff ) { | ||
387 | snprintf(buf, sizeof buf, ROCKBOX_DIR "/%s.fnt", | 389 | snprintf(buf, sizeof buf, ROCKBOX_DIR "/%s.fnt", |
388 | global_settings.font_file); | 390 | global_settings.font_file); |
389 | font_load(buf); | 391 | font_load(buf); |
390 | } | 392 | } |
391 | #endif | 393 | #endif |
392 | if ( global_settings.lang_file[0] ) { | 394 | if ( global_settings.lang_file[0] && |
395 | global_settings.lang_file[0] != 0xff ) { | ||
393 | snprintf(buf, sizeof buf, ROCKBOX_DIR "/%s.lng", | 396 | snprintf(buf, sizeof buf, ROCKBOX_DIR "/%s.lng", |
394 | global_settings.lang_file); | 397 | global_settings.lang_file); |
395 | lang_load(buf); | 398 | lang_load(buf); |