diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2010-05-15 21:27:22 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2010-05-15 21:27:22 +0000 |
commit | 964dcb33b6b55347ee6ad4020bd00843fbcd2a1d (patch) | |
tree | 337ecee78c71e4b08b251508acd4135d3fc70601 /apps | |
parent | b6c3bc1cc90a05d462abc674ee7fc2f9567be453 (diff) | |
download | rockbox-964dcb33b6b55347ee6ad4020bd00843fbcd2a1d.tar.gz rockbox-964dcb33b6b55347ee6ad4020bd00843fbcd2a1d.zip |
Revert r26055 since it breaks certain Archos targets.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26067 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/misc.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/apps/misc.c b/apps/misc.c index 07b4c947a2..3dfc2892ca 100644 --- a/apps/misc.c +++ b/apps/misc.c | |||
@@ -264,12 +264,8 @@ static bool clean_shutdown(void (*callback)(void *), void *parameter) | |||
264 | scrobbler_poweroff(); | 264 | scrobbler_poweroff(); |
265 | 265 | ||
266 | #if CONFIG_CHARGING && !defined(HAVE_POWEROFF_WHILE_CHARGING) | 266 | #if CONFIG_CHARGING && !defined(HAVE_POWEROFF_WHILE_CHARGING) |
267 | #if CONFIG_CHARGING >= CHARGING_MONITOR | ||
268 | if(!charging_state()) | ||
269 | #else | ||
270 | if(!charger_inserted()) | 267 | if(!charger_inserted()) |
271 | #endif | 268 | #endif |
272 | #endif | ||
273 | { | 269 | { |
274 | bool batt_safe = battery_level_safe(); | 270 | bool batt_safe = battery_level_safe(); |
275 | int audio_stat = audio_status(); | 271 | int audio_stat = audio_status(); |
@@ -410,11 +406,7 @@ bool list_stop_handler(void) | |||
410 | 406 | ||
411 | if (TIME_BEFORE(current_tick, last_off + HZ/2)) | 407 | if (TIME_BEFORE(current_tick, last_off + HZ/2)) |
412 | { | 408 | { |
413 | #if CONFIG_CHARGING >= CHARGING_MONITOR | 409 | if (charger_inserted()) |
414 | if (charging_state()) | ||
415 | #else | ||
416 | if (charger_inserted()) | ||
417 | #endif | ||
418 | { | 410 | { |
419 | charging_splash(); | 411 | charging_splash(); |
420 | ret = true; /* screen is dirty, caller needs to refresh */ | 412 | ret = true; /* screen is dirty, caller needs to refresh */ |