diff options
Diffstat (limited to 'apps/main.c')
-rw-r--r-- | apps/main.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/apps/main.c b/apps/main.c index 7bde823712..6d4e638b02 100644 --- a/apps/main.c +++ b/apps/main.c | |||
@@ -60,8 +60,10 @@ | |||
60 | #include "misc.h" | 60 | #include "misc.h" |
61 | #include "database.h" | 61 | #include "database.h" |
62 | #include "dircache.h" | 62 | #include "dircache.h" |
63 | #include "tagcache.h" | ||
63 | #include "lang.h" | 64 | #include "lang.h" |
64 | #include "string.h" | 65 | #include "string.h" |
66 | #include "splash.h" | ||
65 | 67 | ||
66 | #if (CONFIG_CODEC == SWCODEC) | 68 | #if (CONFIG_CODEC == SWCODEC) |
67 | #include "pcmbuf.h" | 69 | #include "pcmbuf.h" |
@@ -130,6 +132,8 @@ void init_dircache(void) | |||
130 | lcd_update(); | 132 | lcd_update(); |
131 | } | 133 | } |
132 | } | 134 | } |
135 | |||
136 | tagcache_init(); | ||
133 | } | 137 | } |
134 | #else | 138 | #else |
135 | # define init_dircache(...) | 139 | # define init_dircache(...) |
@@ -320,7 +324,18 @@ void init(void) | |||
320 | } | 324 | } |
321 | 325 | ||
322 | settings_calc_config_sector(); | 326 | settings_calc_config_sector(); |
323 | settings_load(SETTINGS_ALL); | 327 | |
328 | /* Reset settings if holding the rec button. */ | ||
329 | if ((button_status() & BUTTON_REC) == BUTTON_REC) | ||
330 | { | ||
331 | gui_syncsplash(HZ*2, true, str(LANG_RESET_DONE_CLEAR)); | ||
332 | settings_reset(); | ||
333 | } | ||
334 | else | ||
335 | { | ||
336 | settings_load(SETTINGS_ALL); | ||
337 | } | ||
338 | |||
324 | init_dircache(); | 339 | init_dircache(); |
325 | gui_sync_wps_init(); | 340 | gui_sync_wps_init(); |
326 | settings_apply(); | 341 | settings_apply(); |