diff options
| author | Jonathan Gordon <rockbox@jdgordon.info> | 2010-06-23 05:48:35 +0000 |
|---|---|---|
| committer | Jonathan Gordon <rockbox@jdgordon.info> | 2010-06-23 05:48:35 +0000 |
| commit | f101c8ad621145c478dee49f24de0b5a70cd5ae3 (patch) | |
| tree | 09697c83af3801fc1135865dde532c5261519683 /apps | |
| parent | 64d3a22ec02ae98acee2edb13e63dbdee9e56125 (diff) | |
| download | rockbox-f101c8ad621145c478dee49f24de0b5a70cd5ae3.zip rockbox-f101c8ad621145c478dee49f24de0b5a70cd5ae3.tar.gz rockbox-f101c8ad621145c478dee49f24de0b5a70cd5ae3.tar.bz2 rockbox-f101c8ad621145c478dee49f24de0b5a70cd5ae3.tar.xz | |
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
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/gui/usb_screen.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/apps/gui/usb_screen.c b/apps/gui/usb_screen.c index 6500413..00e128b 100644 --- a/apps/gui/usb_screen.c +++ b/apps/gui/usb_screen.c @@ -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) { |