summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2004-12-16 22:31:26 +0000
committerJens Arnold <amiconn@rockbox.org>2004-12-16 22:31:26 +0000
commit7197edd8e202bab797e3ff402ff433609046684d (patch)
tree9130bdd6cce4bc15a4d68f08a9a72392346e12d2 /apps
parent127c363e87e9dd95fd5ab598660967b99ec1a400 (diff)
downloadrockbox-7197edd8e202bab797e3ff402ff433609046684d.tar.gz
rockbox-7197edd8e202bab797e3ff402ff433609046684d.tar.bz2
rockbox-7197edd8e202bab797e3ff402ff433609046684d.zip
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
Diffstat (limited to 'apps')
-rw-r--r--apps/main.c7
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 */