Fixes sleep timer when connected to charger (patch #769591 by Henrik Backe)

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3975 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 10 insertions, 4 deletions

diff --git a/apps/wps.c b/apps/wps.c
index d41413c179..f34ec81d9c 100644
--- a/apps/wps.c
+++ b/apps/wps.c
@@ -738,6 +738,12 @@ int wps_show(void)
             continue;
         }
 
+        /* Exit if mpeg has stopped playing. This can happen if using the
+           sleep timer with the charger plugged or if starting a recording
+           from F1 */
+        if (!mpeg_status())
+            exit = true;
+
         switch(button)
         {
             case BUTTON_ON:
@@ -882,10 +888,6 @@ int wps_show(void)
                 if (menu())
                     return SYS_USB_CONNECTED;
 
-                /* if user recorded, playback is stopped and we should exit */
-                if (!mpeg_status())
-                    exit = true;
-
                 restore = true;
                 break;
 
@@ -947,6 +949,10 @@ int wps_show(void)
             mpeg_stop();
             status_set_playmode(STATUS_STOP);
 
+            /* Keys can be locked when exiting, so either unlock here
+               or implement key locking in tree.c too */
+            keys_locked=false;
+
             /* set dir browser to current playing song */
             if (global_settings.browse_current &&
                 current_track_path[0] != '\0')