summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2010-03-07 03:20:34 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2010-03-07 03:20:34 +0000
commit792f7335af244ced7e467047a0e450998547fa2e (patch)
treed19f96ab175bf6d7cadc4d335902d47d5ebd326d
parent4f63db9de033958d4597526e1401e9f344d783e9 (diff)
downloadrockbox-792f7335af244ced7e467047a0e450998547fa2e.tar.gz
rockbox-792f7335af244ced7e467047a0e450998547fa2e.zip
revert part of r25042 so boot error splashes are localised, and so there isnt a boot slowdown (which was the origional reason for r24922)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25050 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/main.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/apps/main.c b/apps/main.c
index e05bd7bdfa..fa1500edd5 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -337,7 +337,7 @@ static void init(void)
337 storage_init(); 337 storage_init();
338 settings_reset(); 338 settings_reset();
339 settings_load(SETTINGS_ALL); 339 settings_load(SETTINGS_ALL);
340 settings_apply(false); 340 settings_apply(true);
341 init_dircache(true); 341 init_dircache(true);
342 init_dircache(false); 342 init_dircache(false);
343#ifdef HAVE_TAGCACHE 343#ifdef HAVE_TAGCACHE
@@ -376,7 +376,6 @@ static void init(void)
376 audio_init(); 376 audio_init();
377 button_clear_queue(); /* Empty the keyboard buffer */ 377 button_clear_queue(); /* Empty the keyboard buffer */
378 378
379 settings_apply(true);
380 settings_apply_skins(); 379 settings_apply_skins();
381} 380}
382 381
@@ -571,7 +570,7 @@ static void init(void)
571#endif 570#endif
572 } 571 }
573 572
574 settings_apply(false); 573 settings_apply(true);
575 init_dircache(false); 574 init_dircache(false);
576#ifdef HAVE_TAGCACHE 575#ifdef HAVE_TAGCACHE
577 init_tagcache(); 576 init_tagcache();
@@ -636,7 +635,6 @@ static void init(void)
636#ifdef HAVE_HOTSWAP_STORAGE_AS_MAIN 635#ifdef HAVE_HOTSWAP_STORAGE_AS_MAIN
637 check_bootfile(false); /* remember write time and filesize */ 636 check_bootfile(false); /* remember write time and filesize */
638#endif 637#endif
639 settings_apply(true);
640 settings_apply_skins(); 638 settings_apply_skins();
641} 639}
642 640