summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiika Pekkarinen <miipekk@ihme.org>2005-12-07 12:35:54 +0000
committerMiika Pekkarinen <miipekk@ihme.org>2005-12-07 12:35:54 +0000
commit8e8c1a8b8f8ed244e2f10074d6fd435c586b7c8e (patch)
treebef7b658d965042370995ac88145db40433ebe50
parente769b80cd9f8004ddc3b6ac5bcf0dc513821941e (diff)
downloadrockbox-8e8c1a8b8f8ed244e2f10074d6fd435c586b7c8e.zip
rockbox-8e8c1a8b8f8ed244e2f10074d6fd435c586b7c8e.tar.gz
rockbox-8e8c1a8b8f8ed244e2f10074d6fd435c586b7c8e.tar.bz2
rockbox-8e8c1a8b8f8ed244e2f10074d6fd435c586b7c8e.tar.xz
Now define SETTINGS_RESET if we have a button to reset settings during
boot. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8191 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/main.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/apps/main.c b/apps/main.c
index d90e23a..6985426 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -71,6 +71,7 @@
#endif
#if defined(IRIVER_H100_SERIES) && !defined(SIMULATOR)
#include "pcm_record.h"
+#define SETTINGS_RESET BUTTON_REC
#endif
#ifdef CONFIG_TUNER
@@ -322,16 +323,17 @@ void init(void)
settings_calc_config_sector();
+#ifdef SETTINGS_RESET
/* Reset settings if holding the rec button. */
- if ((button_status() & BUTTON_REC) == BUTTON_REC)
+ if ((button_status() & SETTINGS_RESET) == SETTINGS_RESET)
{
gui_syncsplash(HZ*2, true, str(LANG_RESET_DONE_CLEAR));
settings_reset();
}
else
- {
+#endif
settings_load(SETTINGS_ALL);
- }
+
init_dircache();
gui_sync_wps_init();