diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2010-02-27 15:16:08 +0000 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2010-02-27 15:16:08 +0000 |
| commit | ba15f45f6e7f1b00cceb38ba8cef5451ee8b427b (patch) | |
| tree | 12204da21d5258b8888d89f3580e48747a3c90a9 /apps | |
| parent | 3f8d4a5a0f0ee98bc5299c6eb83e0461beebe5a6 (diff) | |
| download | rockbox-ba15f45f6e7f1b00cceb38ba8cef5451ee8b427b.zip rockbox-ba15f45f6e7f1b00cceb38ba8cef5451ee8b427b.tar.gz rockbox-ba15f45f6e7f1b00cceb38ba8cef5451ee8b427b.tar.bz2 rockbox-ba15f45f6e7f1b00cceb38ba8cef5451ee8b427b.tar.xz | |
Properly handle empty and '-' font settings.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24942 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/settings.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/settings.c b/apps/settings.c index ffefa31..954b7d3 100644 --- a/apps/settings.c +++ b/apps/settings.c @@ -835,7 +835,8 @@ void settings_apply(void) #ifdef HAVE_LCD_BITMAP /* fonts need to be loaded before the WPS */ - if ( global_settings.font_file[0]) { + if (global_settings.font_file[0] + && global_settings.font_file[0] != '-') { snprintf(buf, sizeof buf, FONT_DIR "/%s.fnt", global_settings.font_file); if (font_load(NULL, buf) < 0) @@ -844,7 +845,8 @@ void settings_apply(void) else font_reset(NULL); #ifdef HAVE_REMOTE_LCD - if ( global_settings.remote_font_file[0]) { + if ( global_settings.remote_font_file[0] + && global_settings.remote_font_file[0] != '-') { snprintf(buf, sizeof buf, FONT_DIR "/%s.fnt", global_settings.remote_font_file); if (font_load_remoteui(buf) < 0) |