diff options
author | Linus Nielsen Feltzing <linus@haxx.se> | 2004-07-26 07:39:23 +0000 |
---|---|---|
committer | Linus Nielsen Feltzing <linus@haxx.se> | 2004-07-26 07:39:23 +0000 |
commit | 0c01305eb9a5cb5d10ed7af4d4eb66b0a998141e (patch) | |
tree | 5631478571fc212735f65e8a07296b9b2214a2e4 | |
parent | 0aeed7d14831c799a22f854432fa52ae185206a1 (diff) | |
download | rockbox-0c01305eb9a5cb5d10ed7af4d4eb66b0a998141e.tar.gz rockbox-0c01305eb9a5cb5d10ed7af4d4eb66b0a998141e.zip |
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.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/tree.c b/apps/tree.c index 25e0a370e9..72a2261024 100644 --- a/apps/tree.c +++ b/apps/tree.c | |||
@@ -642,9 +642,7 @@ static bool ask_resume(bool ask_once) | |||
642 | break; | 642 | break; |
643 | 643 | ||
644 | default: | 644 | default: |
645 | /* React only on release events */ | 645 | stop = true; |
646 | if(button & BUTTON_REL) | ||
647 | stop = true; | ||
648 | break; | 646 | break; |
649 | } | 647 | } |
650 | } | 648 | } |
@@ -1016,7 +1014,7 @@ static bool dirbrowse(char *root, int *dirfilter) | |||
1016 | break; | 1014 | break; |
1017 | 1015 | ||
1018 | #ifdef HAVE_RECORDER_KEYPAD | 1016 | #ifdef HAVE_RECORDER_KEYPAD |
1019 | case BUTTON_OFF | BUTTON_REL: | 1017 | case BUTTON_OFF: |
1020 | /* Stop the music if it is playing, else show the shutdown | 1018 | /* Stop the music if it is playing, else show the shutdown |
1021 | screen */ | 1019 | screen */ |
1022 | if(mpeg_status()) | 1020 | if(mpeg_status()) |
@@ -1025,6 +1023,8 @@ static bool dirbrowse(char *root, int *dirfilter) | |||
1025 | if (!charger_inserted()) { | 1023 | if (!charger_inserted()) { |
1026 | shutdown_screen(); | 1024 | shutdown_screen(); |
1027 | restore = true; | 1025 | restore = true; |
1026 | } else { | ||
1027 | charging_splash(); | ||
1028 | } | 1028 | } |
1029 | } | 1029 | } |
1030 | break; | 1030 | break; |