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

1 files changed, 5 insertions, 5 deletions

diff --git a/firmware/backlight.c b/firmware/backlight.c
index edd78ec7ef..22b507e25d 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
 }