diff options
Diffstat (limited to 'apps/main.c')
-rw-r--r-- | apps/main.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/apps/main.c b/apps/main.c index dff9dc5778..d52c17a67e 100644 --- a/apps/main.c +++ b/apps/main.c | |||
@@ -566,7 +566,12 @@ static void init(void) | |||
566 | pcm_init(); | 566 | pcm_init(); |
567 | dsp_init(); | 567 | dsp_init(); |
568 | 568 | ||
569 | #if defined(SETTINGS_RESET) || (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | 569 | CHART(">settings_load(ALL)"); |
570 | settings_load(SETTINGS_ALL); | ||
571 | CHART("<settings_load(ALL)"); | ||
572 | |||
573 | #if defined(SETTINGS_RESET) || \ | ||
574 | (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | ||
570 | (CONFIG_KEYPAD == IRIVER_H10_PAD) | 575 | (CONFIG_KEYPAD == IRIVER_H10_PAD) |
571 | #ifdef SETTINGS_RESET | 576 | #ifdef SETTINGS_RESET |
572 | /* Reset settings if holding the reset button. (Rec on Archos, | 577 | /* Reset settings if holding the reset button. (Rec on Archos, |
@@ -577,16 +582,13 @@ static void init(void) | |||
577 | if (button_hold()) | 582 | if (button_hold()) |
578 | #endif | 583 | #endif |
579 | { | 584 | { |
580 | splash(HZ*2, str(LANG_RESET_DONE_CLEAR)); | 585 | if (global_settings.clear_settings_on_hold) |
581 | settings_reset(); | 586 | { |
587 | splash(HZ*2, str(LANG_RESET_DONE_CLEAR)); | ||
588 | settings_reset(); | ||
589 | } | ||
582 | } | 590 | } |
583 | else | ||
584 | #endif | 591 | #endif |
585 | { | ||
586 | CHART(">settings_load(ALL)"); | ||
587 | settings_load(SETTINGS_ALL); | ||
588 | CHART("<settings_load(ALL)"); | ||
589 | } | ||
590 | 592 | ||
591 | #ifdef HAVE_DIRCACHE | 593 | #ifdef HAVE_DIRCACHE |
592 | CHART(">init_dircache(true)"); | 594 | CHART(">init_dircache(true)"); |