From 3029b1509c1ce4ab9cb9adb3f87442f4d2674a75 Mon Sep 17 00:00:00 2001 From: jdgordon Date: Sun, 7 Mar 2010 03:20:34 +0000 Subject: [PATCH] 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 --- apps/main.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/apps/main.c b/apps/main.c index e05bd7bdf..fa1500edd 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(false); + settings_apply(true); init_dircache(true); init_dircache(false); #ifdef HAVE_TAGCACHE @@ -376,7 +376,6 @@ static void init(void) audio_init(); button_clear_queue(); /* Empty the keyboard buffer */ - settings_apply(true); settings_apply_skins(); } @@ -571,7 +570,7 @@ static void init(void) #endif } - settings_apply(false); + settings_apply(true); init_dircache(false); #ifdef HAVE_TAGCACHE init_tagcache(); @@ -636,7 +635,6 @@ 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(); } -- 2.11.4.GIT