diff options
author | Sebastian Leonhardt <sebastian.leonhardt@web.de> | 2019-06-25 22:32:39 +0200 |
---|---|---|
committer | Sebastian Leonhardt <sebastian.leonhardt@web.de> | 2019-06-27 14:19:05 +0200 |
commit | 3e504c3dcd16ec93fb70b10c4f5a361633d7a77b (patch) | |
tree | b39a57140b94fa8954c1dcdf8f7a564ffe01ecad /firmware/backlight.c | |
parent | 7b118eccac021934f7731396767dd0b50320acc6 (diff) | |
download | rockbox-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 'firmware/backlight.c')
-rw-r--r-- | firmware/backlight.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/firmware/backlight.c b/firmware/backlight.c index caff55ce5e..e8a71af12c 100644 --- a/firmware/backlight.c +++ b/firmware/backlight.c | |||
@@ -209,15 +209,18 @@ static void backlight_lcd_sleep_countdown(bool start) | |||
209 | } | 209 | } |
210 | 210 | ||
211 | /* Start LCD sleep countdown */ | 211 | /* Start LCD sleep countdown */ |
212 | if (lcd_sleep_timeout < 0) | 212 | if (lcd_sleep_timeout <= 0) |
213 | { | 213 | { |
214 | lcd_sleep_timer = 0; /* Setting == Always */ | 214 | lcd_sleep_timer = 0; |
215 | /* Ensure lcd_sleep() is called from backlight_thread() */ | 215 | if (lcd_sleep_timeout == 0) /* Setting == Always */ |
216 | { | ||
217 | /* Ensure lcd_sleep() is called from backlight_thread() */ | ||
216 | #if (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_PWM) | 218 | #if (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_PWM) |
217 | queue_post(&backlight_queue, LCD_SLEEP, 0); | 219 | queue_post(&backlight_queue, LCD_SLEEP, 0); |
218 | #else | 220 | #else |
219 | lcd_sleep(); | 221 | lcd_sleep(); |
220 | #endif | 222 | #endif |
223 | } | ||
221 | } | 224 | } |
222 | else | 225 | else |
223 | { | 226 | { |