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

Text viewer: Handle font loading failures

Browse source 
When font load fails, revert by loading to the previous font or to the global
settings font.

Fixes FS#11185 - Text viewer returns div by 0 if font is missing, renamed or corrupted


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25544 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Tomer Shalev 2010-04-08 21:56:03 +00:00
parent 00b18de831
commit c3f131de06
1 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

18
apps/plugins/viewer.c
View file

@ -1693,18 +1693,11 @@ static bool change_font(unsigned char *font)
rb->snprintf(buf, MAX_PATH, "%s/%s.fnt", FONT_DIR, font); rb->snprintf(buf, MAX_PATH, "%s/%s.fnt", FONT_DIR, font);
if (rb->font_load(NULL, buf) < 0) { if (rb->font_load(NULL, buf) < 0) {
rb->splash(HZ/2, "Font load failed."); rb->splash(HZ/2, "Font load failed.");
return false; return false;
} }
return true; return true;
} }
static void revert_font(void)
{
if (rb->strcmp(prefs.font, rb->global_settings->font_file))
change_font(rb->global_settings->font_file);
}
#endif #endif
static bool viewer_init(void) static bool viewer_init(void)
@ -2190,9 +2183,11 @@ read_end:
start_position = file_pos + screen_top_ptr - buffer; start_position = file_pos + screen_top_ptr - buffer;
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
/* load prefs font if it is different than the global settings font */
if (rb->strcmp(prefs.font, rb->global_settings->font_file)) { if (rb->strcmp(prefs.font, rb->global_settings->font_file)) {
if (!change_font(prefs.font)) { if (!change_font(prefs.font)) {
revert_font(); /* fallback by re-loading the global settings font */
if (!change_font(rb->global_settings->font_file))
return false; return false;
} }
} }
@ -2715,9 +2710,10 @@ static bool font_setting(void)
if (new_font != old_font) if (new_font != old_font)
{ {
if (!change_font(prefs.font)) /* load selected font */
{ if (!change_font((unsigned char *)names[new_font].string)) {
revert_font(); /* revert by re-loading the preferences font */
change_font(prefs.font);
return false; return false;
} }
rb->memset(prefs.font, 0, MAX_PATH); rb->memset(prefs.font, 0, MAX_PATH);