diff options
author | Jens Arnold <amiconn@rockbox.org> | 2005-11-21 18:39:18 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2005-11-21 18:39:18 +0000 |
commit | bccfae0a58515e489c3aa7f412154db56ae205d6 (patch) | |
tree | e541651d8cd61b1ddd44e4860a6c7e5a8784901e /apps/main.c | |
parent | f839ccb36fb40bb81e88ebca1f0ce6f572b01a51 (diff) | |
download | rockbox-bccfae0a58515e489c3aa7f412154db56ae205d6.tar.gz rockbox-bccfae0a58515e489c3aa7f412154db56ae205d6.zip |
Fixed crash with early USB. The USB screen already uses some of the new GUI code, so we have to init before. Fixed problem with gui_syncstatusbar_init() drawing the status bar(s) right away.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8030 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/main.c')
-rw-r--r-- | apps/main.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/apps/main.c b/apps/main.c index 4f23dfaba4..9afb3e9a13 100644 --- a/apps/main.c +++ b/apps/main.c | |||
@@ -148,6 +148,9 @@ void init(void) | |||
148 | font_init(); | 148 | font_init(); |
149 | show_logo(); | 149 | show_logo(); |
150 | lang_init(); | 150 | lang_init(); |
151 | /* Must be done before any code uses the multi-screen APi */ | ||
152 | screen_access_init(); | ||
153 | gui_syncstatusbar_init(&statusbars); | ||
151 | settings_reset(); | 154 | settings_reset(); |
152 | settings_calc_config_sector(); | 155 | settings_calc_config_sector(); |
153 | settings_load(SETTINGS_ALL); | 156 | settings_load(SETTINGS_ALL); |
@@ -245,6 +248,10 @@ void init(void) | |||
245 | radio_init(); | 248 | radio_init(); |
246 | #endif | 249 | #endif |
247 | 250 | ||
251 | /* Must be done before any code uses the multi-screen APi */ | ||
252 | screen_access_init(); | ||
253 | gui_syncstatusbar_init(&statusbars); | ||
254 | |||
248 | #if defined(HAVE_CHARGING) && (CONFIG_CPU == SH7034) | 255 | #if defined(HAVE_CHARGING) && (CONFIG_CPU == SH7034) |
249 | if (coldstart && charger_inserted() | 256 | if (coldstart && charger_inserted() |
250 | && !global_settings.car_adapter_mode | 257 | && !global_settings.car_adapter_mode |