From 02b9c65ea314066b20cc4c391e6e1e69035924c9 Mon Sep 17 00:00:00 2001 From: Boris Gjenero Date: Mon, 6 Apr 2009 01:47:28 +0000 Subject: [PATCH] Fix FS#10091 - On Archos targets properly detect charger at startup, so charging screen can be entered git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20634 a1c6a512-1295-4272-9138-f99709370657 --- apps/main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/main.c b/apps/main.c index 54ff191a3a..642ec5be08 100644 --- a/apps/main.c +++ b/apps/main.c @@ -422,7 +422,9 @@ static void init(void) gui_syncstatusbar_init(&statusbars); #if CONFIG_CHARGING && (CONFIG_CPU == SH7034) - if (coldstart && charger_inserted() + /* charger_inserted() can't be used here because power_thread() + hasn't checked power_input_status() yet */ + if (coldstart && (power_input_status() & POWER_INPUT_MAIN_CHARGER) && !global_settings.car_adapter_mode #ifdef ATA_POWER_PLAYERSTYLE && !ide_powered() /* relies on probing result from bootloader */