diff options
author | Magnus Holmgren <magnushol@gmail.com> | 2006-11-07 19:03:29 +0000 |
---|---|---|
committer | Magnus Holmgren <magnushol@gmail.com> | 2006-11-07 19:03:29 +0000 |
commit | 50deedc6c76cd94d718d417f1de8de258d704349 (patch) | |
tree | ee26bb45a2e68c586c7de367f4a29372b580e0b8 | |
parent | 398c8027104089f3a36717f18ad3e965729f0db7 (diff) | |
download | rockbox-50deedc6c76cd94d718d417f1de8de258d704349.tar.gz rockbox-50deedc6c76cd94d718d417f1de8de258d704349.zip |
UI simulator: fix startup freeze if a language had been selected.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11459 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/main.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/apps/main.c b/apps/main.c index 05b4ab54a3..abe73414c1 100644 --- a/apps/main.c +++ b/apps/main.c | |||
@@ -225,6 +225,9 @@ void init(void) | |||
225 | button_init(); | 225 | button_init(); |
226 | backlight_init(); | 226 | backlight_init(); |
227 | lang_init(); | 227 | lang_init(); |
228 | #if CONFIG_CODEC == SWCODEC | ||
229 | audio_preinit(); /* Must be done before settings_apply() */ | ||
230 | #endif | ||
228 | /* Must be done before any code uses the multi-screen APi */ | 231 | /* Must be done before any code uses the multi-screen APi */ |
229 | screen_access_init(); | 232 | screen_access_init(); |
230 | gui_syncstatusbar_init(&statusbars); | 233 | gui_syncstatusbar_init(&statusbars); |
@@ -256,10 +259,6 @@ void init(void) | |||
256 | global_settings.mdb_enable, | 259 | global_settings.mdb_enable, |
257 | global_settings.superbass); | 260 | global_settings.superbass); |
258 | 261 | ||
259 | #if CONFIG_CODEC == SWCODEC | ||
260 | audio_preinit(); | ||
261 | #endif | ||
262 | |||
263 | scrobbler_init(); | 262 | scrobbler_init(); |
264 | 263 | ||
265 | /* audio_init must to know the size of voice buffer so init voice first */ | 264 | /* audio_init must to know the size of voice buffer so init voice first */ |