summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Nielsen Feltzing <linus@haxx.se>2004-07-26 07:39:23 +0000
committerLinus Nielsen Feltzing <linus@haxx.se>2004-07-26 07:39:23 +0000
commit0c01305eb9a5cb5d10ed7af4d4eb66b0a998141e (patch)
tree5631478571fc212735f65e8a07296b9b2214a2e4
parent0aeed7d14831c799a22f854432fa52ae185206a1 (diff)
downloadrockbox-0c01305eb9a5cb5d10ed7af4d4eb66b0a998141e.zip
rockbox-0c01305eb9a5cb5d10ed7af4d4eb66b0a998141e.tar.gz
rockbox-0c01305eb9a5cb5d10ed7af4d4eb66b0a998141e.tar.bz2
rockbox-0c01305eb9a5cb5d10ed7af4d4eb66b0a998141e.tar.xz
Act on the button-down event for the clean shutdown, and show the charging splash if the charger is attached
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4948 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/tree.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/tree.c b/apps/tree.c
index 25e0a37..72a2261 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -642,9 +642,7 @@ static bool ask_resume(bool ask_once)
break;
default:
- /* React only on release events */
- if(button & BUTTON_REL)
- stop = true;
+ stop = true;
break;
}
}
@@ -1016,7 +1014,7 @@ static bool dirbrowse(char *root, int *dirfilter)
break;
#ifdef HAVE_RECORDER_KEYPAD
- case BUTTON_OFF | BUTTON_REL:
+ case BUTTON_OFF:
/* Stop the music if it is playing, else show the shutdown
screen */
if(mpeg_status())
@@ -1025,6 +1023,8 @@ static bool dirbrowse(char *root, int *dirfilter)
if (!charger_inserted()) {
shutdown_screen();
restore = true;
+ } else {
+ charging_splash();
}
}
break;