Restore the 'read_disk' flag for settings_apply that was removed in r24922. It is still needed to prevent uncessary disk I/O for fonts etc. Should fix FS#11071 (I haven't tested it on a HD-based player).

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25042 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 4 insertions, 2 deletions

diff --git a/apps/main.c b/apps/main.c
index dd41559328..e05bd7bdfa 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -337,7 +337,7 @@ static void init(void)
     storage_init();
     settings_reset();
     settings_load(SETTINGS_ALL);
-    settings_apply();
+    settings_apply(false);
     init_dircache(true);
     init_dircache(false);
 #ifdef HAVE_TAGCACHE
@@ -376,6 +376,7 @@ static void init(void)
     audio_init();
     button_clear_queue(); /* Empty the keyboard buffer */
     
+    settings_apply(true);
     settings_apply_skins();
 }
 
@@ -570,7 +571,7 @@ static void init(void)
 #endif
     }
 
-    settings_apply();
+    settings_apply(false);
     init_dircache(false);
 #ifdef HAVE_TAGCACHE
     init_tagcache();
@@ -635,6 +636,7 @@ static void init(void)
 #ifdef HAVE_HOTSWAP_STORAGE_AS_MAIN
     check_bootfile(false); /* remember write time and filesize */
 #endif
+    settings_apply(true);
     settings_apply_skins();
 }