summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorLinus Nielsen Feltzing <linus@haxx.se>2005-09-02 07:59:42 +0000
committerLinus Nielsen Feltzing <linus@haxx.se>2005-09-02 07:59:42 +0000
commitb3050e90459849cacfbad6f3109d884cee9bbcaf (patch)
tree187b55e512134ecf900ddfaa735b691b60d450f5 /apps
parentc35f6a0676b6de7d2ade8705f8c51dbea925a362 (diff)
downloadrockbox-b3050e90459849cacfbad6f3109d884cee9bbcaf.tar.gz
rockbox-b3050e90459849cacfbad6f3109d884cee9bbcaf.zip
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
Diffstat (limited to 'apps')
-rw-r--r--apps/tree.c11
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) {