summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2005-06-22 23:24:45 +0000
committerJens Arnold <amiconn@rockbox.org>2005-06-22 23:24:45 +0000
commit337f3a1b99a01f12ef0aea7bf67ddb727899d208 (patch)
tree5bc3e6a777edfabd7de11722d20c221737db19f6 /apps
parent7ec8aa2a2c356f5929daa44e9e38386107d70f44 (diff)
downloadrockbox-337f3a1b99a01f12ef0aea7bf67ddb727899d208.zip
rockbox-337f3a1b99a01f12ef0aea7bf67ddb727899d208.tar.gz
rockbox-337f3a1b99a01f12ef0aea7bf67ddb727899d208.tar.bz2
rockbox-337f3a1b99a01f12ef0aea7bf67ddb727899d208.tar.xz
Make the simulator builds know about software poweroff, for more consistent behaviour to the targets. Changed some #if conditions to better reflect the hardware. Fixes iriver sim.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6833 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/tree.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/tree.c b/apps/tree.c
index b096b89..1332fc0 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -820,7 +820,7 @@ static bool dirbrowse(void)
break;
#ifdef TREE_OFF
-#ifndef HAVE_SW_POWEROFF
+#if (CONFIG_KEYPAD == RECORDER_PAD) && !defined(HAVE_SW_POWEROFF)
case TREE_OFF:
if (*tc.dirfilter < NUM_FILTER_MODES)
{
@@ -839,7 +839,7 @@ static bool dirbrowse(void)
}
break;
#endif
-#if defined(HAVE_CHARGING) && !defined(IRIVER_H100)
+#if defined(HAVE_CHARGING) && !defined(HAVE_POWEROFF_WHILE_CHARGING)
case TREE_OFF | BUTTON_REPEAT:
if (charger_inserted()) {
charging_splash();