1
0
Fork 0
forked from len0rd/rockbox

r27028 again.. properly close font fd's and reload the skins on usb exit (disk should be spinning so hopefully not disastrous!)

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27077 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2010-06-23 05:48:35 +00:00
parent 64d3a22ec0
commit f101c8ad62

View file

@ -41,6 +41,7 @@
#ifdef HAVE_LCD_BITMAP
#include "bitmaps/usblogo.h"
#include "skin_engine/skin_fonts.h"
#endif
#ifdef HAVE_REMOTE_LCD
@ -261,6 +262,14 @@ void gui_usb_screen_run(void)
usb_keypad_mode = global_settings.usb_keypad_mode;
#endif
/* The font system leaves the .fnt fd's open, so we need for force close them all */
#ifdef HAVE_LCD_BITMAP
font_reset(NULL);
#ifdef HAVE_REMOTE_LCD
font_load_remoteui(NULL);
#endif
skin_font_init(); /* unload all the skin fonts */
#endif
FOR_NB_SCREENS(i)
{
struct screen *screen = &screens[i];
@ -314,6 +323,11 @@ void gui_usb_screen_run(void)
#ifdef HAVE_LCD_CHARCELLS
status_set_usb(false);
#endif /* HAVE_LCD_CHARCELLS */
#ifdef HAVE_LCD_BITMAP
/* Not pretty, reload all settings so fonts are loaded again correctly */
settings_apply(true);
settings_apply_skins();
#endif
FOR_NB_SCREENS(i)
{