devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Properly handle empty and '-' font settings.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24942 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2010-02-27 15:16:08 +00:00
parent 3f8d4a5a0f
commit ba15f45f6e
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
apps/settings.c
View file

@ -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)