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.zip rockbox-964dcb33b6b55347ee6ad4020bd00843fbcd2a1d.tar.gz rockbox-964dcb33b6b55347ee6ad4020bd00843fbcd2a1d.tar.bz2 rockbox-964dcb33b6b55347ee6ad4020bd00843fbcd2a1d.tar.xz | |
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 07b4c94..3dfc289 100644 --- a/apps/misc.c +++ b/apps/misc.c @@ -264,12 +264,8 @@ static bool clean_shutdown(void (*callback)(void *), void *parameter) scrobbler_poweroff(); #if CONFIG_CHARGING && !defined(HAVE_POWEROFF_WHILE_CHARGING) -#if CONFIG_CHARGING >= CHARGING_MONITOR - if(!charging_state()) -#else if(!charger_inserted()) #endif -#endif { bool batt_safe = battery_level_safe(); int audio_stat = audio_status(); @@ -410,11 +406,7 @@ bool list_stop_handler(void) if (TIME_BEFORE(current_tick, last_off + HZ/2)) { -#if CONFIG_CHARGING >= CHARGING_MONITOR - if (charging_state()) -#else - if (charger_inserted()) -#endif + if (charger_inserted()) { charging_splash(); ret = true; /* screen is dirty, caller needs to refresh */ |