From ba15f45f6e7f1b00cceb38ba8cef5451ee8b427b Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Sat, 27 Feb 2010 15:16:08 +0000 Subject: Properly handle empty and '-' font settings. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24942 a1c6a512-1295-4272-9138-f99709370657 --- apps/settings.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'apps') 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) -- cgit v1.1