From 6281d8e21434878a72e63bf917f6c5520f9fb2c1 Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Wed, 23 Jun 2010 02:57:04 +0000 Subject: revert r27027,27028, 27071 - need to find a correct way to close font fd's. 27027 caused data aborts, 27028 caused multifont issues after returning from usb git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27072 a1c6a512-1295-4272-9138-f99709370657 --- firmware/font.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'firmware') diff --git a/firmware/font.c b/firmware/font.c index c5348d5..f158471 100644 --- a/firmware/font.c +++ b/firmware/font.c @@ -449,14 +449,11 @@ int font_load(struct font* pf, const char *path) void font_unload(int font_id) { struct font* pf = sysfonts[font_id]; - if (font_id && pf) + if (font_id >= SYSTEMFONTCOUNT && pf) { if (pf->fd >= 0) close(pf->fd); - if (font_id == FONT_UI) - font_reset(pf); - else if (font_id >= SYSTEMFONTCOUNT) - sysfonts[font_id] = NULL; + sysfonts[font_id] = NULL; } } -- cgit v1.1