diff options
author | Teruaki Kawashima <teru@rockbox.org> | 2009-08-27 13:30:26 +0000 |
---|---|---|
committer | Teruaki Kawashima <teru@rockbox.org> | 2009-08-27 13:30:26 +0000 |
commit | ed940e883079a323b0764532a7444ad022685ae4 (patch) | |
tree | e95e7e869c41018ecf33657be5991c3d685bb797 | |
parent | 9f64794c70722430d5fdbafd367367c54e2870e1 (diff) | |
download | rockbox-ed940e883079a323b0764532a7444ad022685ae4.tar.gz 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.c | 26 |
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 @@ | |||
121 | const char appsversion[]=APPSVERSION; | 121 | const char appsversion[]=APPSVERSION; |
122 | 122 | ||
123 | static void init(void); | 123 | static void init(void); |
124 | 124 | ||
125 | #ifdef SIMULATOR | 125 | #ifdef SIMULATOR |
126 | void app_main(void) | 126 | void app_main(void) |
127 | #else | 127 | #else |
@@ -142,6 +142,18 @@ static void app_main(void) | |||
142 | /* All threads should be created and public queues registered by now */ | 142 | /* All threads should be created and public queues registered by now */ |
143 | usb_start_monitoring(); | 143 | usb_start_monitoring(); |
144 | #endif | 144 | #endif |
145 | |||
146 | #ifdef AUTOROCK | ||
147 | { | ||
148 | static const char filename[] = PLUGIN_APPS_DIR "/autostart.rock"; | ||
149 | |||
150 | if(file_exists(filename)) /* no complaint if it doesn't exist */ | ||
151 | { | ||
152 | plugin_load((char*)filename, NULL); /* start if it does */ | ||
153 | } | ||
154 | } | ||
155 | #endif /* #ifdef AUTOROCK */ | ||
156 | |||
145 | root_menu(); | 157 | root_menu(); |
146 | } | 158 | } |
147 | 159 | ||
@@ -202,7 +214,6 @@ static int init_dircache(bool preinit) | |||
202 | splashf(0, "Dircache failed, disabled. Result: %d", result); | 214 | splashf(0, "Dircache failed, disabled. Result: %d", result); |
203 | global_settings.dircache = false; | 215 | global_settings.dircache = false; |
204 | } | 216 | } |
205 | |||
206 | } | 217 | } |
207 | 218 | ||
208 | if (clear) | 219 | if (clear) |
@@ -579,17 +590,6 @@ static void init(void) | |||
579 | /* runtime database has to be initialized after audio_init() */ | 590 | /* runtime database has to be initialized after audio_init() */ |
580 | cpu_boost(false); | 591 | cpu_boost(false); |
581 | 592 | ||
582 | #ifdef AUTOROCK | ||
583 | { | ||
584 | static const char filename[] = PLUGIN_APPS_DIR "/autostart.rock"; | ||
585 | |||
586 | if(file_exists(filename)) /* no complaint if it doesn't exist */ | ||
587 | { | ||
588 | plugin_load((char*)filename, NULL); /* start if it does */ | ||
589 | } | ||
590 | } | ||
591 | #endif /* #ifdef AUTOROCK */ | ||
592 | |||
593 | #if CONFIG_CHARGING | 593 | #if CONFIG_CHARGING |
594 | car_adapter_mode_init(); | 594 | car_adapter_mode_init(); |
595 | #endif | 595 | #endif |