The start-in-record-screen option now has priority over the resume-on-startup option

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

1 files changed, 6 insertions, 5 deletions

diff --git a/apps/tree.c b/apps/tree.c
index e56c7a76de..c42d18beab 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -614,19 +614,20 @@ static bool dirbrowse(void)
     lastfirstpos = 0;
 
     if (*tc.dirfilter < NUM_FILTER_MODES) {
-        start_resume(true);
-
 #ifdef HAVE_RECORDING
 #ifndef SIMULATOR
-        if (global_settings.rec_startup && ! start_wps) {
-            /* We fake being in the menu structure by calling the appropriate */
-            /* parent when we drop out of each screen */
+        if (global_settings.rec_startup) {
+            /* We fake being in the menu structure by calling
+               the appropriate parent when we drop out of each screen */
             recording_screen();
             rec_menu();
             main_menu();
         }
+        else
 #endif
 #endif
+        start_resume(true);
+
     }
     
     if (!start_wps) {