summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Nielsen Feltzing <linus@haxx.se>2005-02-10 21:53:41 +0000
committerLinus Nielsen Feltzing <linus@haxx.se>2005-02-10 21:53:41 +0000
commit6da68019b5c3b26f8dee8d209aaf563790d4e73d (patch)
tree0133da6ddb638d35f5efa6df34e7ae304181ef14
parentabcb16192eef1f54fee0eff5356fff1bc303da39 (diff)
downloadrockbox-6da68019b5c3b26f8dee8d209aaf563790d4e73d.zip
rockbox-6da68019b5c3b26f8dee8d209aaf563790d4e73d.tar.gz
rockbox-6da68019b5c3b26f8dee8d209aaf563790d4e73d.tar.bz2
rockbox-6da68019b5c3b26f8dee8d209aaf563790d4e73d.tar.xz
iRiver: Allow shutdown when charging
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5887 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/misc.c2
-rw-r--r--apps/tree.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/apps/misc.c b/apps/misc.c
index c92e817..e69880f 100644
--- a/apps/misc.c
+++ b/apps/misc.c
@@ -229,7 +229,9 @@ bool clean_shutdown(void)
#ifdef SIMULATOR
exit(0);
#else
+#ifndef IRIVER_H100
if(!charger_inserted())
+#endif
{
lcd_clear_display();
splash(0, true, str(LANG_SHUTTINGDOWN));
diff --git a/apps/tree.c b/apps/tree.c
index 2fd91db..25b1796 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -807,6 +807,7 @@ static bool dirbrowse(void)
}
break;
#endif
+#ifndef IRIVER_H100
case TREE_OFF | BUTTON_REPEAT:
if (charger_inserted()) {
charging_splash();
@@ -814,6 +815,7 @@ static bool dirbrowse(void)
}
break;
#endif
+#endif
case TREE_PREV:
case TREE_PREV | BUTTON_REPEAT: