Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Moved initial checking of sleeptimer_on_startup from root_menu.c to settings.c

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31439 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Nick Peskett 2011-12-26 09:57:55 +00:00
parent fdcf5e48e1
commit 3074b64025
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/root_menu.c
View file

@ -664,9 +664,6 @@ void root_menu(void)
next_screen = GO_TO_ROOT; next_screen = GO_TO_ROOT;
#endif #endif
if (global_settings.sleeptimer_on_startup)
set_sleep_timer(global_settings.sleeptimer_duration * 60);
while (true) while (true)
{ {
switch (next_screen) switch (next_screen)

2
apps/settings.c
View file

@ -844,6 +844,8 @@ void settings_apply(bool read_disk)
dac_line_in(global_settings.line_in); dac_line_in(global_settings.line_in);
#endif #endif
set_poweroff_timeout(global_settings.poweroff); set_poweroff_timeout(global_settings.poweroff);
if (global_settings.sleeptimer_on_startup)
set_sleep_timer(global_settings.sleeptimer_duration * 60);
set_keypress_restarts_sleep_timer( set_keypress_restarts_sleep_timer(
global_settings.keypress_restarts_sleeptimer); global_settings.keypress_restarts_sleeptimer);