summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2008-05-14 21:29:43 +0000
committerMichael Sevakis <jethead71@rockbox.org>2008-05-14 21:29:43 +0000
commit955d889a15e6d61e9cbd9b2f35af48ec7b6f3bac (patch)
tree4fd61c2294c18979ffa008c66461655a028b30f2
parent3903b0e59c4f2153b21d2dbeac43aabde03e9fe9 (diff)
downloadrockbox-955d889a15e6d61e9cbd9b2f35af48ec7b6f3bac.zip
rockbox-955d889a15e6d61e9cbd9b2f35af48ec7b6f3bac.tar.gz
rockbox-955d889a15e6d61e9cbd9b2f35af48ec7b6f3bac.tar.bz2
rockbox-955d889a15e6d61e9cbd9b2f35af48ec7b6f3bac.tar.xz
Oops. Left a couple things in a bad state when using fading.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17515 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/backlight.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/firmware/backlight.c b/firmware/backlight.c
index edd78ec..22b507e 100644
--- a/firmware/backlight.c
+++ b/firmware/backlight.c
@@ -342,6 +342,10 @@ static void backlight_dim(int value)
static void _backlight_on(void)
{
+#ifdef HAVE_LCD_SLEEP
+ backlight_lcd_sleep_countdown(false);
+#endif
+
if (bl_fade_in_step > 0)
{
#ifdef _BACKLIGHT_FADE_ENABLE
@@ -355,10 +359,6 @@ static void _backlight_on(void)
bl_dim_fraction = (BL_PWM_COUNT<<16);
_backlight_on_normal();
}
-
-#ifdef HAVE_LCD_SLEEP
- backlight_lcd_sleep(false);
-#endif
}
static void _backlight_off(void)
@@ -374,7 +374,7 @@ static void _backlight_off(void)
}
#ifdef HAVE_LCD_SLEEP
- backlight_start_lcd_sleep_counter(false);
+ backlight_lcd_sleep_countdown(true);
#endif
}