summaryrefslogtreecommitdiffstats
path: root/apps/settings.c
diff options
context:
space:
mode:
authorDana Conrad <dconrad@fastmail.com>2021-05-27 18:26:59 -0500
committerAidan MacDonald <amachronic@protonmail.com>2021-06-04 00:00:57 +0000
commit14f7a958af8c343d96a500c713df34f76fcb9d80 (patch)
tree7babc9f6ccc172930cf01008eccc1900a4298ddf /apps/settings.c
parentcec6422ace933fecc02053c0fa6b239f7a6792e5 (diff)
downloadrockbox-14f7a958af8c343d96a500c713df34f76fcb9d80.tar.gz
rockbox-14f7a958af8c343d96a500c713df34f76fcb9d80.zip
Softlock Improvements
Add a check to see if the keys are currently locked and allow them to be unlocked to ensure we don't get stuck when the current playlist ends while the WPS is locked. (Original by Aidan MacDonald) Adding initialization for unlock_combo and to arm the autolock (if enabled) without the user needing to press the lock button at least once every boot (which is the prior behavior). Removing screen_has_lock check from is_keys_locked() Change-Id: I0fbf9b9746b011a7086ec8505a7ecc4b84f2d332
Diffstat (limited to 'apps/settings.c')
-rw-r--r--apps/settings.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/apps/settings.c b/apps/settings.c
index 99cede382b..f89fc581ca 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -1010,6 +1010,7 @@ void settings_apply(bool read_disk)
set_selective_softlock_actions(
global_settings.bt_selective_softlock_actions,
global_settings.bt_selective_softlock_actions_mask);
+ action_autosoftlock_init();
#endif
#ifdef HAVE_TOUCHPAD_SENSITIVITY_SETTING