Player: Do not display charging screen on coldstart with charger connected if HD is powered. This is to suppress the charging screen for very old players which cannot control HD power, and relies on proper probing in the bootloader.

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

1 files changed, 6 insertions, 1 deletions

diff --git a/apps/main.c b/apps/main.c
index 742c941924..ac84027362 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -201,7 +201,12 @@ void init(void)
 #endif
 
 #ifdef HAVE_CHARGING
-    if (coldstart && charger_inserted() && !global_settings.car_adapter_mode)
+    if (coldstart && charger_inserted()
+        && !global_settings.car_adapter_mode
+#ifdef ATA_POWER_PLAYERSTYLE
+        && !ide_powered() /* relies on probing result from bootloader */
+#endif
+        )
     {
         rc = charging_screen(); /* display a "charging" screen */
         if (rc == 1 || rc == 2)  /* charger removed or "Off/Stop" pressed */