If HAVE_POWEROFF_WHILE_CHARGING is not defined and the charging configuration specifies CHARGING_MONITOR or greater, allow poweroff while plugged but not actually charging the battery.

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

1 files changed, 4 insertions, 0 deletions

diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c
index f7523d776c..100957b77a 100644
--- a/firmware/drivers/button.c
+++ b/firmware/drivers/button.c
@@ -205,8 +205,12 @@ static void button_tick(void)
 #endif
                                     ) &&
 #if CONFIG_CHARGING && !defined(HAVE_POWEROFF_WHILE_CHARGING)
+#if CONFIG_CHARGING >= CHARGING_MONITOR
+                                !charging_state() &&
+#else
                                 !charger_inserted() &&
 #endif
+#endif
                                 repeat_count > POWEROFF_COUNT)
                         {
                             /* Tell the main thread that it's time to