diff options
| author | Jens Arnold <amiconn@rockbox.org> | 2007-04-09 13:39:37 +0000 |
|---|---|---|
| committer | Jens Arnold <amiconn@rockbox.org> | 2007-04-09 13:39:37 +0000 |
| commit | 178c565beb521230ec5434f59e36c2592f32a281 (patch) | |
| tree | fcc205085b783b2458a95429019ae42ae1754c97 /apps/root_menu.c | |
| parent | dcb4aa242b5180214b899004c3860364c4466a1e (diff) | |
| download | rockbox-178c565beb521230ec5434f59e36c2592f32a281.tar.gz rockbox-178c565beb521230ec5434f59e36c2592f32a281.zip | |
Stop/shutdown logic rework in browsers and menus. Recorder V1: Double-Off shutdown is now possible from menus and sub-browsers as well. Player, other targets which are always powered during charging: Attempted shutdown from menu with charger plugged now displays the charging splash.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13079 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/root_menu.c')
| -rw-r--r-- | apps/root_menu.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/apps/root_menu.c b/apps/root_menu.c index 1fc330941c..1b97cdef42 100644 --- a/apps/root_menu.c +++ b/apps/root_menu.c @@ -25,11 +25,13 @@ #include "root_menu.h" #include "lang.h" #include "settings.h" +#include "screens.h" #include "kernel.h" #include "debug.h" #include "misc.h" #include "rolo.h" #include "powermgmt.h" +#include "power.h" #if LCD_DEPTH > 1 #include "backdrop.h" @@ -304,7 +306,10 @@ MENUITEM_RETURNVALUE(bookmarks, ID2P(LANG_BOOKMARK_MENU_RECENT_BOOKMARKS), #ifdef HAVE_LCD_CHARCELLS static int do_shutdown(void) { - sys_poweroff(); + if (charger_inserted()) + charging_splash(); + else + sys_poweroff(); return 0; } MENUITEM_FUNCTION(do_shutdown_item, 0, ID2P(LANG_SHUTDOWN), |