summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorSebastian Leonhardt <sebastian.leonhardt@web.de>2019-06-25 22:32:39 +0200
committerSebastian Leonhardt <sebastian.leonhardt@web.de>2019-06-27 14:19:05 +0200
commit3e504c3dcd16ec93fb70b10c4f5a361633d7a77b (patch)
treeb39a57140b94fa8954c1dcdf8f7a564ffe01ecad /apps
parent7b118eccac021934f7731396767dd0b50320acc6 (diff)
downloadrockbox-3e504c3dcd16ec93fb70b10c4f5a361633d7a77b.tar.gz
rockbox-3e504c3dcd16ec93fb70b10c4f5a361633d7a77b.zip
Fix reversal of "always/never" in "LCD setting > Sleep (After Backlight Off)"
The bug was introduced in a06d9c8. The patch also fixes some (more or less) related obsolete comments. Change-Id: I5e491d64574c37cdbc46b146d7cfc555d86b9a11
Diffstat (limited to 'apps')
-rw-r--r--apps/settings.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/settings.h b/apps/settings.h
index ee67a1734f..fc82c8bf45 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -668,9 +668,8 @@ struct user_settings
668#endif 668#endif
669 unsigned char kbd_file[MAX_FILENAME+1]; /* last keyboard */ 669 unsigned char kbd_file[MAX_FILENAME+1]; /* last keyboard */
670#endif /* HAVE_LCD_BITMAP */ 670#endif /* HAVE_LCD_BITMAP */
671 int backlight_timeout; /* backlight off timeout: 0-18 0=never, 671 int backlight_timeout; /* backlight off timeout: -1=never,
672 1=always, 672 0=always, or time in seconds */
673 then according to timeout_values[] */
674 bool caption_backlight; /* turn on backlight at end and start of track */ 673 bool caption_backlight; /* turn on backlight at end and start of track */
675 bool bl_filter_first_keypress; /* filter first keypress when dark? */ 674 bool bl_filter_first_keypress; /* filter first keypress when dark? */
676#if CONFIG_CHARGING 675#if CONFIG_CHARGING
@@ -689,7 +688,8 @@ struct user_settings
689#endif 688#endif
690#ifdef HAVE_LCD_SLEEP_SETTING 689#ifdef HAVE_LCD_SLEEP_SETTING
691 int lcd_sleep_after_backlight_off; /* when to put lcd to sleep after backlight 690 int lcd_sleep_after_backlight_off; /* when to put lcd to sleep after backlight
692 has turned off */ 691 has turned off: -1=never, 0=always,
692 or time in seconds */
693#endif 693#endif
694#endif /* HAVE_BACKLIGHT */ 694#endif /* HAVE_BACKLIGHT */
695 695
@@ -707,8 +707,8 @@ struct user_settings
707#ifdef HAVE_REMOTE_LCD 707#ifdef HAVE_REMOTE_LCD
708 /* remote lcd */ 708 /* remote lcd */
709 int remote_contrast; /* lcd contrast: 0-63 0=low 63=high */ 709 int remote_contrast; /* lcd contrast: 0-63 0=low 63=high */
710 int remote_backlight_timeout; /* backlight off timeout: 0-18 0=never, 710 int remote_backlight_timeout; /* backlight off timeout: -1=never,
711 1=always, then according to timeout_values[] */ 711 0=always, or time in seconds */
712 int remote_backlight_timeout_plugged; 712 int remote_backlight_timeout_plugged;
713 int remote_scroll_speed; /* long texts scrolling speed: 1-30 */ 713 int remote_scroll_speed; /* long texts scrolling speed: 1-30 */
714 int remote_scroll_delay; /* delay (in 1/10s) before starting scroll */ 714 int remote_scroll_delay; /* delay (in 1/10s) before starting scroll */