Use plugged backlight timeout when usb powered

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9086 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 10 insertions, 2 deletions

diff --git a/firmware/backlight.c b/firmware/backlight.c
index 1a7ea8e7f0..cfacbef28a 100644
--- a/firmware/backlight.c
+++ b/firmware/backlight.c
@@ -332,7 +332,11 @@ void backlight_thread(void)
 #ifdef HAVE_REMOTE_LCD
             case REMOTE_BACKLIGHT_ON:
 #ifdef HAVE_CHARGING
-                if (charger_inserted())
+                if (charger_inserted()
+#ifdef HAVE_USB_POWER
+                        || usb_powered()
+#endif
+                        )
                     remote_backlight_timer = remote_backlight_timeout_plugged;
                 else
 #endif
@@ -357,7 +361,11 @@ void backlight_thread(void)
 #endif /* HAVE_REMOTE_LCD */
             case BACKLIGHT_ON:
 #ifdef HAVE_CHARGING
-                if (charger_inserted())
+                if (charger_inserted()
+#ifdef HAVE_USB_POWER
+                        || usb_powered()
+#endif
+                        )
                     backlight_timer = backlight_timeout_plugged;
                 else
 #endif