Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

text viewer: don't load font if it is the same font currently used.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26725 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Teruaki Kawashima 2010-06-09 14:41:24 +00:00
parent bc58b7d984
commit 96598c61f1
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
apps/plugins/text_viewer/tv_window.c
View file

@ -282,31 +282,25 @@ static void tv_change_preferences(const struct tv_preferences *oldp)
const unsigned char *font_str;
font_str = (oldp && !font_changing)? oldp->font_name : rb->global_settings->font_file;
font_changing = true;
/* change font */
if (rb->strcmp(font_str, prefs->font_name))
if (font_changing || rb->strcmp(font_str, prefs->font_name))
{
font_changing = true;
if (!tv_set_font(prefs->font_name))
{
struct tv_preferences new_prefs = *prefs;
rb->strlcpy(new_prefs.font_name, font_str, MAX_PATH);
tv_set_preferences(&new_prefs);
return;
}
}
else if (!oldp || font_changing)
tv_set_font(font_str);
font_changing = false;
/* calculates display lines */
tv_check_header_and_footer();
display_lines = tv_calc_display_lines();
/* if font_changing == false, the remaining processes need not be executed. */
if (!font_changing)
return;
font_changing = false;
#else
(void)oldp;