diff options
| author | Jonathan Gordon <rockbox@jdgordon.info> | 2010-03-07 03:20:34 +0000 |
|---|---|---|
| committer | Jonathan Gordon <rockbox@jdgordon.info> | 2010-03-07 03:20:34 +0000 |
| commit | 792f7335af244ced7e467047a0e450998547fa2e (patch) | |
| tree | d19f96ab175bf6d7cadc4d335902d47d5ebd326d /apps/main.c | |
| parent | 4f63db9de033958d4597526e1401e9f344d783e9 (diff) | |
| download | rockbox-792f7335af244ced7e467047a0e450998547fa2e.zip rockbox-792f7335af244ced7e467047a0e450998547fa2e.tar.gz rockbox-792f7335af244ced7e467047a0e450998547fa2e.tar.bz2 rockbox-792f7335af244ced7e467047a0e450998547fa2e.tar.xz | |
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
Diffstat (limited to 'apps/main.c')
| -rw-r--r-- | apps/main.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/apps/main.c b/apps/main.c index e05bd7b..fa1500e 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(); } |