diff options
Diffstat (limited to 'apps/main.c')
-rw-r--r-- | apps/main.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/apps/main.c b/apps/main.c index 515a9978f5..59932d6185 100644 --- a/apps/main.c +++ b/apps/main.c | |||
@@ -570,16 +570,18 @@ static void init(void) | |||
570 | settings_load(SETTINGS_ALL); | 570 | settings_load(SETTINGS_ALL); |
571 | CHART("<settings_load(ALL)"); | 571 | CHART("<settings_load(ALL)"); |
572 | 572 | ||
573 | #if defined(SETTINGS_RESET) || \ | 573 | #if defined(BUTTON_REC) || \ |
574 | (CONFIG_KEYPAD == GIGABEAT_PAD) || \ | ||
574 | (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | 575 | (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
575 | (CONFIG_KEYPAD == IRIVER_H10_PAD) | 576 | (CONFIG_KEYPAD == IRIVER_H10_PAD) |
577 | if (global_settings.clear_settings_on_hold && | ||
576 | #ifdef SETTINGS_RESET | 578 | #ifdef SETTINGS_RESET |
577 | /* Reset settings if holding the reset button. (Rec on Archos, | 579 | /* Reset settings if holding the reset button. (Rec on Archos, |
578 | A on Gigabeat) */ | 580 | A on Gigabeat) */ |
579 | if ((button_status() & SETTINGS_RESET) == SETTINGS_RESET) | 581 | ((button_status() & SETTINGS_RESET) == SETTINGS_RESET)) |
580 | #else | 582 | #else |
581 | /* Reset settings if the hold button is turned on */ | 583 | /* Reset settings if the hold button is turned on */ |
582 | if (global_settings.clear_settings_on_hold && button_hold()) | 584 | (button_hold())) |
583 | #endif | 585 | #endif |
584 | { | 586 | { |
585 | splash(HZ*2, str(LANG_RESET_DONE_CLEAR)); | 587 | splash(HZ*2, str(LANG_RESET_DONE_CLEAR)); |