summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeruaki Kawashima <teru@rockbox.org>2009-08-27 13:30:26 +0000
committerTeruaki Kawashima <teru@rockbox.org>2009-08-27 13:30:26 +0000
commited940e883079a323b0764532a7444ad022685ae4 (patch)
treee95e7e869c41018ecf33657be5991c3d685bb797
parent9f64794c70722430d5fdbafd367367c54e2870e1 (diff)
downloadrockbox-ed940e883079a323b0764532a7444ad022685ae4.tar.gz
rockbox-ed940e883079a323b0764532a7444ad022685ae4.tar.bz2
rockbox-ed940e883079a323b0764532a7444ad022685ae4.zip
fix FS#10550. Start autostart.rock after gui_syncstatusbar_init().
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22517 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/main.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/apps/main.c b/apps/main.c
index 49542e8b01..6aa16e5cb6 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -121,7 +121,7 @@
const char appsversion[]=APPSVERSION;
static void init(void);
-
+
#ifdef SIMULATOR
void app_main(void)
#else
@@ -142,6 +142,18 @@ static void app_main(void)
/* All threads should be created and public queues registered by now */
usb_start_monitoring();
#endif
+
+#ifdef AUTOROCK
+ {
+ static const char filename[] = PLUGIN_APPS_DIR "/autostart.rock";
+
+ if(file_exists(filename)) /* no complaint if it doesn't exist */
+ {
+ plugin_load((char*)filename, NULL); /* start if it does */
+ }
+ }
+#endif /* #ifdef AUTOROCK */
+
root_menu();
}
@@ -202,7 +214,6 @@ static int init_dircache(bool preinit)
splashf(0, "Dircache failed, disabled. Result: %d", result);
global_settings.dircache = false;
}
-
}
if (clear)
@@ -579,17 +590,6 @@ static void init(void)
/* runtime database has to be initialized after audio_init() */
cpu_boost(false);
-#ifdef AUTOROCK
- {
- static const char filename[] = PLUGIN_APPS_DIR "/autostart.rock";
-
- if(file_exists(filename)) /* no complaint if it doesn't exist */
- {
- plugin_load((char*)filename, NULL); /* start if it does */
- }
- }
-#endif /* #ifdef AUTOROCK */
-
#if CONFIG_CHARGING
car_adapter_mode_init();
#endif