diff options
Diffstat (limited to 'apps/main.c')
-rw-r--r-- | apps/main.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/apps/main.c b/apps/main.c index 3e98343708..6d2609b486 100644 --- a/apps/main.c +++ b/apps/main.c | |||
@@ -329,7 +329,7 @@ static void init(void) | |||
329 | storage_init(); | 329 | storage_init(); |
330 | settings_reset(); | 330 | settings_reset(); |
331 | settings_load(SETTINGS_ALL); | 331 | settings_load(SETTINGS_ALL); |
332 | settings_apply(true); | 332 | settings_apply(false); |
333 | init_dircache(true); | 333 | init_dircache(true); |
334 | init_dircache(false); | 334 | init_dircache(false); |
335 | #ifdef HAVE_TAGCACHE | 335 | #ifdef HAVE_TAGCACHE |
@@ -367,6 +367,8 @@ static void init(void) | |||
367 | 367 | ||
368 | audio_init(); | 368 | audio_init(); |
369 | button_clear_queue(); /* Empty the keyboard buffer */ | 369 | button_clear_queue(); /* Empty the keyboard buffer */ |
370 | |||
371 | settings_apply(true); | ||
370 | } | 372 | } |
371 | 373 | ||
372 | #else | 374 | #else |
@@ -560,7 +562,7 @@ static void init(void) | |||
560 | #endif | 562 | #endif |
561 | } | 563 | } |
562 | 564 | ||
563 | settings_apply(true); | 565 | settings_apply(false); |
564 | init_dircache(false); | 566 | init_dircache(false); |
565 | #ifdef HAVE_TAGCACHE | 567 | #ifdef HAVE_TAGCACHE |
566 | init_tagcache(); | 568 | init_tagcache(); |
@@ -625,6 +627,8 @@ static void init(void) | |||
625 | #ifdef HAVE_HOTSWAP_STORAGE_AS_MAIN | 627 | #ifdef HAVE_HOTSWAP_STORAGE_AS_MAIN |
626 | check_bootfile(false); /* remember write time and filesize */ | 628 | check_bootfile(false); /* remember write time and filesize */ |
627 | #endif | 629 | #endif |
630 | |||
631 | settings_apply(true); | ||
628 | } | 632 | } |
629 | 633 | ||
630 | #ifdef CPU_PP | 634 | #ifdef CPU_PP |