diff options
author | Nick Peskett <rockbox@peskett.co.uk> | 2011-12-26 09:57:55 +0000 |
---|---|---|
committer | Nick Peskett <rockbox@peskett.co.uk> | 2011-12-26 09:57:55 +0000 |
commit | 3074b64025e474bb1943b58d76ebf471d89fdbbf (patch) | |
tree | 188ca37803779e09a724eba1797a1cc3360e9812 /apps/settings.c | |
parent | fdcf5e48e1221ca8575170269dcfd31fd6869152 (diff) | |
download | rockbox-3074b64025e474bb1943b58d76ebf471d89fdbbf.tar.gz rockbox-3074b64025e474bb1943b58d76ebf471d89fdbbf.zip |
Moved initial checking of sleeptimer_on_startup from root_menu.c to settings.c
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31439 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings.c')
-rw-r--r-- | apps/settings.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/apps/settings.c b/apps/settings.c index 39390f408e..13913f2d85 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -844,6 +844,8 @@ void settings_apply(bool read_disk) | |||
844 | dac_line_in(global_settings.line_in); | 844 | dac_line_in(global_settings.line_in); |
845 | #endif | 845 | #endif |
846 | set_poweroff_timeout(global_settings.poweroff); | 846 | set_poweroff_timeout(global_settings.poweroff); |
847 | if (global_settings.sleeptimer_on_startup) | ||
848 | set_sleep_timer(global_settings.sleeptimer_duration * 60); | ||
847 | set_keypress_restarts_sleep_timer( | 849 | set_keypress_restarts_sleep_timer( |
848 | global_settings.keypress_restarts_sleeptimer); | 850 | global_settings.keypress_restarts_sleeptimer); |
849 | 851 | ||