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 | |
parent | 64d3a22ec02ae98acee2edb13e63dbdee9e56125 (diff) | |
download | rockbox-f101c8ad621145c478dee49f24de0b5a70cd5ae3.tar.gz rockbox-f101c8ad621145c478dee49f24de0b5a70cd5ae3.zip |
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
-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 6500413ed7..00e128be7c 100644 --- a/apps/gui/usb_screen.c +++ b/apps/gui/usb_screen.c | |||
@@ -41,6 +41,7 @@ | |||
41 | 41 | ||
42 | #ifdef HAVE_LCD_BITMAP | 42 | #ifdef HAVE_LCD_BITMAP |
43 | #include "bitmaps/usblogo.h" | 43 | #include "bitmaps/usblogo.h" |
44 | #include "skin_engine/skin_fonts.h" | ||
44 | #endif | 45 | #endif |
45 | 46 | ||
46 | #ifdef HAVE_REMOTE_LCD | 47 | #ifdef HAVE_REMOTE_LCD |
@@ -261,6 +262,14 @@ void gui_usb_screen_run(void) | |||
261 | usb_keypad_mode = global_settings.usb_keypad_mode; | 262 | usb_keypad_mode = global_settings.usb_keypad_mode; |
262 | #endif | 263 | #endif |
263 | 264 | ||
265 | /* The font system leaves the .fnt fd's open, so we need for force close them all */ | ||
266 | #ifdef HAVE_LCD_BITMAP | ||
267 | font_reset(NULL); | ||
268 | #ifdef HAVE_REMOTE_LCD | ||
269 | font_load_remoteui(NULL); | ||
270 | #endif | ||
271 | skin_font_init(); /* unload all the skin fonts */ | ||
272 | #endif | ||
264 | FOR_NB_SCREENS(i) | 273 | FOR_NB_SCREENS(i) |
265 | { | 274 | { |
266 | struct screen *screen = &screens[i]; | 275 | struct screen *screen = &screens[i]; |
@@ -314,6 +323,11 @@ void gui_usb_screen_run(void) | |||
314 | #ifdef HAVE_LCD_CHARCELLS | 323 | #ifdef HAVE_LCD_CHARCELLS |
315 | status_set_usb(false); | 324 | status_set_usb(false); |
316 | #endif /* HAVE_LCD_CHARCELLS */ | 325 | #endif /* HAVE_LCD_CHARCELLS */ |
326 | #ifdef HAVE_LCD_BITMAP | ||
327 | /* Not pretty, reload all settings so fonts are loaded again correctly */ | ||
328 | settings_apply(true); | ||
329 | settings_apply_skins(); | ||
330 | #endif | ||
317 | 331 | ||
318 | FOR_NB_SCREENS(i) | 332 | FOR_NB_SCREENS(i) |
319 | { | 333 | { |