summaryrefslogtreecommitdiff
path: root/apps/menus
diff options
context:
space:
mode:
authorWilliam Wilgus <wilgus.william@gmail.com>2022-03-15 17:12:40 -0400
committerWilliam Wilgus <wilgus.william@gmail.com>2022-06-20 18:57:25 -0400
commited37c2e8948960b45c9bac58f1ffb678fdf31f5d (patch)
tree8eeda559c74a45e21eb112e75fcd7e62c788a18e /apps/menus
parent58bf7c7e6fc9d94cbf1dacf3bd6b889fc4844895 (diff)
downloadrockbox-ed37c2e8948960b45c9bac58f1ffb678fdf31f5d.tar.gz
rockbox-ed37c2e8948960b45c9bac58f1ffb678fdf31f5d.zip
FS#13193 - Add option to disable settings reset on startup
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
Diffstat (limited to 'apps/menus')
-rw-r--r--apps/menus/settings_menu.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c
index 2539f17860..60f206c86f 100644
--- a/apps/menus/settings_menu.c
+++ b/apps/menus/settings_menu.c
@@ -584,6 +584,14 @@ MENUITEM_SETTING(keypress_restarts_sleeptimer,
584 &global_settings.keypress_restarts_sleeptimer, NULL); 584 &global_settings.keypress_restarts_sleeptimer, NULL);
585MENUITEM_SETTING(show_shutdown_message, &global_settings.show_shutdown_message, NULL); 585MENUITEM_SETTING(show_shutdown_message, &global_settings.show_shutdown_message, NULL);
586 586
587#if defined(SETTINGS_RESET) || \
588 (CONFIG_KEYPAD == IPOD_4G_PAD) || \
589 (CONFIG_KEYPAD == IRIVER_H10_PAD)
590#define SETTINGS_CLEAR_ON_HOLD
591MENUITEM_SETTING(clear_settings_on_hold,
592 &global_settings.clear_settings_on_hold, NULL);
593#endif
594
587MAKE_MENU(startup_shutdown_menu, ID2P(LANG_STARTUP_SHUTDOWN), 595MAKE_MENU(startup_shutdown_menu, ID2P(LANG_STARTUP_SHUTDOWN),
588 0, Icon_System_menu, 596 0, Icon_System_menu,
589 &show_shutdown_message, 597 &show_shutdown_message,
@@ -592,7 +600,11 @@ MAKE_MENU(startup_shutdown_menu, ID2P(LANG_STARTUP_SHUTDOWN),
592 &sleeptimer_toggle, 600 &sleeptimer_toggle,
593 &sleeptimer_duration, 601 &sleeptimer_duration,
594 &sleeptimer_on_startup, 602 &sleeptimer_on_startup,
595 &keypress_restarts_sleeptimer 603 &keypress_restarts_sleeptimer,
604#if defined(SETTINGS_CLEAR_ON_HOLD)
605 &clear_settings_on_hold,
606#undef SETTINGS_CLEAR_ON_HOLD
607#endif
596 ); 608 );
597 609
598/* STARTUP/SHUTDOWN MENU */ 610/* STARTUP/SHUTDOWN MENU */