summaryrefslogtreecommitdiff
path: root/apps
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 /apps
parentabcb16192eef1f54fee0eff5356fff1bc303da39 (diff)
downloadrockbox-6da68019b5c3b26f8dee8d209aaf563790d4e73d.tar.gz
rockbox-6da68019b5c3b26f8dee8d209aaf563790d4e73d.zip
iRiver: Allow shutdown when charging
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5887 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-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 c92e8173fc..e69880fb40 100644
--- a/apps/misc.c
+++ b/apps/misc.c
@@ -229,7 +229,9 @@ bool clean_shutdown(void)
229#ifdef SIMULATOR 229#ifdef SIMULATOR
230 exit(0); 230 exit(0);
231#else 231#else
232#ifndef IRIVER_H100
232 if(!charger_inserted()) 233 if(!charger_inserted())
234#endif
233 { 235 {
234 lcd_clear_display(); 236 lcd_clear_display();
235 splash(0, true, str(LANG_SHUTTINGDOWN)); 237 splash(0, true, str(LANG_SHUTTINGDOWN));
diff --git a/apps/tree.c b/apps/tree.c
index 2fd91db182..25b1796988 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -807,6 +807,7 @@ static bool dirbrowse(void)
807 } 807 }
808 break; 808 break;
809#endif 809#endif
810#ifndef IRIVER_H100
810 case TREE_OFF | BUTTON_REPEAT: 811 case TREE_OFF | BUTTON_REPEAT:
811 if (charger_inserted()) { 812 if (charger_inserted()) {
812 charging_splash(); 813 charging_splash();
@@ -814,6 +815,7 @@ static bool dirbrowse(void)
814 } 815 }
815 break; 816 break;
816#endif 817#endif
818#endif
817 819
818 case TREE_PREV: 820 case TREE_PREV:
819 case TREE_PREV | BUTTON_REPEAT: 821 case TREE_PREV | BUTTON_REPEAT: