summaryrefslogtreecommitdiffstats
path: root/apps/settings.c
diff options
context:
space:
mode:
authorFred Bauer <fred.w.bauer@gmail.com>2011-10-22 17:13:33 +0000
committerFred Bauer <fred.w.bauer@gmail.com>2011-10-22 17:13:33 +0000
commite299eb3ea36cba48875cf35bb1dcc93eaba0d279 (patch)
treea2d9e853522207fae414d82c9f5e6dba81252ea4 /apps/settings.c
parent4d2ab32339fb8e7c02841e52d35498081503d188 (diff)
downloadrockbox-e299eb3ea36cba48875cf35bb1dcc93eaba0d279.tar.gz
rockbox-e299eb3ea36cba48875cf35bb1dcc93eaba0d279.tar.bz2
rockbox-e299eb3ea36cba48875cf35bb1dcc93eaba0d279.zip
Add functions font_set_ui() and font_get_ui(). The font returned by FONT_UI used to be fixed at zero but since buflib-fonts (r30589) can be different, depending on the order of loads and unloads. Fixes broken behavoir in virtual keyboard (FS#12336), lyrics player (FS#12306), and hopefully, FS#12337
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30826 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings.c')
-rw-r--r--apps/settings.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/apps/settings.c b/apps/settings.c
index 21665e0c6a..7142cfb0c6 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -886,6 +886,7 @@ void settings_apply(bool read_disk)
if (global_status.font_id[SCREEN_MAIN] >= 0)
font_unload(global_status.font_id[SCREEN_MAIN]);
rc = font_load(buf);
+ font_set_ui(rc);
CHART2("<font_load ", global_settings.font_file);
global_status.font_id[SCREEN_MAIN] = rc;
lcd_setfont(rc);