summaryrefslogtreecommitdiff
path: root/apps/main.c
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 /apps/main.c
parente769b80cd9f8004ddc3b6ac5bcf0dc513821941e (diff)
downloadrockbox-8e8c1a8b8f8ed244e2f10074d6fd435c586b7c8e.tar.gz
rockbox-8e8c1a8b8f8ed244e2f10074d6fd435c586b7c8e.zip
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
Diffstat (limited to 'apps/main.c')
-rw-r--r--apps/main.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/apps/main.c b/apps/main.c
index d90e23a06a..6985426fbd 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -71,6 +71,7 @@
71#endif 71#endif
72#if defined(IRIVER_H100_SERIES) && !defined(SIMULATOR) 72#if defined(IRIVER_H100_SERIES) && !defined(SIMULATOR)
73#include "pcm_record.h" 73#include "pcm_record.h"
74#define SETTINGS_RESET BUTTON_REC
74#endif 75#endif
75 76
76#ifdef CONFIG_TUNER 77#ifdef CONFIG_TUNER
@@ -322,16 +323,17 @@ void init(void)
322 323
323 settings_calc_config_sector(); 324 settings_calc_config_sector();
324 325
326#ifdef SETTINGS_RESET
325 /* Reset settings if holding the rec button. */ 327 /* Reset settings if holding the rec button. */
326 if ((button_status() & BUTTON_REC) == BUTTON_REC) 328 if ((button_status() & SETTINGS_RESET) == SETTINGS_RESET)
327 { 329 {
328 gui_syncsplash(HZ*2, true, str(LANG_RESET_DONE_CLEAR)); 330 gui_syncsplash(HZ*2, true, str(LANG_RESET_DONE_CLEAR));
329 settings_reset(); 331 settings_reset();
330 } 332 }
331 else 333 else
332 { 334#endif
333 settings_load(SETTINGS_ALL); 335 settings_load(SETTINGS_ALL);
334 } 336
335 337
336 init_dircache(); 338 init_dircache();
337 gui_sync_wps_init(); 339 gui_sync_wps_init();