Resume rework. With the new resume function, 'Ask' and 'Ask Once' are redundant options, since you can resume after any startup using the resume key. These have been stripped out, and the resume code has been streamlined. A small bug in button handler initialisation has been fixed.

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

1 files changed, 5 insertions, 7 deletions

diff --git a/apps/filetree.c b/apps/filetree.c
index 60443a163c..c7a2dbf071 100644
--- a/apps/filetree.c
+++ b/apps/filetree.c
@@ -447,13 +447,11 @@ int ft_enter(struct tree_context* c)
         }
 
         if ( play ) {
-            if ( global_settings.resume ) {
-                /* the resume_index must always be the index in the
-                   shuffled list in case shuffle is enabled */
-                global_settings.resume_index = start_index;
-                global_settings.resume_offset = 0;
-                settings_save();
-            }
+            /* the resume_index must always be the index in the
+               shuffled list in case shuffle is enabled */
+            global_settings.resume_index = start_index;
+            global_settings.resume_offset = 0;
+            settings_save();
 
             start_wps = true;
         }