diff options
Diffstat (limited to 'apps/settings.c')
-rw-r--r-- | apps/settings.c | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/apps/settings.c b/apps/settings.c index 340adba5b8..8834c9d9bf 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -791,6 +791,25 @@ void settings_apply(bool read_disk) | |||
791 | 791 | ||
792 | if (read_disk) | 792 | if (read_disk) |
793 | { | 793 | { |
794 | |||
795 | #ifdef HAVE_LCD_BITMAP | ||
796 | /* fonts need to be loaded before the WPS */ | ||
797 | if ( global_settings.font_file[0]) { | ||
798 | snprintf(buf, sizeof buf, FONT_DIR "/%s.fnt", | ||
799 | global_settings.font_file); | ||
800 | font_load(buf); | ||
801 | } | ||
802 | else | ||
803 | font_reset(); | ||
804 | |||
805 | if ( global_settings.kbd_file[0]) { | ||
806 | snprintf(buf, sizeof buf, ROCKBOX_DIR "/%s.kbd", | ||
807 | global_settings.kbd_file); | ||
808 | load_kbd(buf); | ||
809 | } | ||
810 | else | ||
811 | load_kbd(NULL); | ||
812 | #endif | ||
794 | #if LCD_DEPTH > 1 | 813 | #if LCD_DEPTH > 1 |
795 | unload_wps_backdrop(); | 814 | unload_wps_backdrop(); |
796 | #endif | 815 | #endif |
@@ -838,24 +857,6 @@ void settings_apply(bool read_disk) | |||
838 | gui_wps[1].data->remote_wps = true; | 857 | gui_wps[1].data->remote_wps = true; |
839 | } | 858 | } |
840 | #endif | 859 | #endif |
841 | |||
842 | #ifdef HAVE_LCD_BITMAP | ||
843 | if ( global_settings.font_file[0]) { | ||
844 | snprintf(buf, sizeof buf, FONT_DIR "/%s.fnt", | ||
845 | global_settings.font_file); | ||
846 | font_load(buf); | ||
847 | } | ||
848 | else | ||
849 | font_reset(); | ||
850 | |||
851 | if ( global_settings.kbd_file[0]) { | ||
852 | snprintf(buf, sizeof buf, ROCKBOX_DIR "/%s.kbd", | ||
853 | global_settings.kbd_file); | ||
854 | load_kbd(buf); | ||
855 | } | ||
856 | else | ||
857 | load_kbd(NULL); | ||
858 | #endif | ||
859 | if ( global_settings.lang_file[0]) { | 860 | if ( global_settings.lang_file[0]) { |
860 | snprintf(buf, sizeof buf, LANG_DIR "/%s.lng", | 861 | snprintf(buf, sizeof buf, LANG_DIR "/%s.lng", |
861 | global_settings.lang_file); | 862 | global_settings.lang_file); |