devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

FS#13193 - Add option to disable settings reset on startup

Browse source 
Updated version of the patch originally by user cockroach

UNTESTED
Ipods?, Iriver H10,
I do not own these players so YMMV

https://www.rockbox.org/tracker/task/13193

Change-Id: I7924837f582cc5c49ee68c186d6822f577f65147
This commit is contained in:
William Wilgus 2022-03-15 17:12:40 -04:00
parent 58bf7c7e6f
commit ed37c2e894
8 changed files with 75 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
apps/main.c
View file

@ -566,7 +566,12 @@ static void init(void)
pcm_init();
dsp_init();
#if defined(SETTINGS_RESET) || (CONFIG_KEYPAD == IPOD_4G_PAD) || \
CHART(">settings_load(ALL)");
settings_load(SETTINGS_ALL);
CHART("<settings_load(ALL)");
#if defined(SETTINGS_RESET) || \
(CONFIG_KEYPAD == IPOD_4G_PAD) || \
(CONFIG_KEYPAD == IRIVER_H10_PAD)
#ifdef SETTINGS_RESET
/* Reset settings if holding the reset button. (Rec on Archos,
@ -577,16 +582,13 @@ static void init(void)
if (button_hold())
#endif
{
splash(HZ*2, str(LANG_RESET_DONE_CLEAR));
settings_reset();
if (global_settings.clear_settings_on_hold)
{
splash(HZ*2, str(LANG_RESET_DONE_CLEAR));
settings_reset();
}
}
else
#endif
{
CHART(">settings_load(ALL)");
settings_load(SETTINGS_ALL);
CHART("<settings_load(ALL)");
}
#ifdef HAVE_DIRCACHE
CHART(">init_dircache(true)");