diff options
| author | Jens Arnold <amiconn@rockbox.org> | 2009-10-03 22:09:27 +0000 |
|---|---|---|
| committer | Jens Arnold <amiconn@rockbox.org> | 2009-10-03 22:09:27 +0000 |
| commit | baef536e29b53a8ced5c6158163ec72144893edd (patch) | |
| tree | 3410f852c3b90102e2ae94f5d1b7e6764b86d6bc /apps | |
| parent | 8783e8d17962f6c475e70c551d1123389cdb453c (diff) | |
| download | rockbox-baef536e29b53a8ced5c6158163ec72144893edd.zip rockbox-baef536e29b53a8ced5c6158163ec72144893edd.tar.gz rockbox-baef536e29b53a8ced5c6158163ec72144893edd.tar.bz2 rockbox-baef536e29b53a8ced5c6158163ec72144893edd.tar.xz | |
Fix crash in early USB introduced in r22365 by moving the gui_syncstatusbar_init() back to where it needs to be. The comment clearly stated that it needs to happen that early.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22903 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/main.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/apps/main.c b/apps/main.c index c751080..a93231e 100644 --- a/apps/main.c +++ b/apps/main.c @@ -139,7 +139,6 @@ static void app_main(void) list_init(); #endif tree_gui_init(); - gui_syncstatusbar_init(&statusbars); viewportmanager_init(); #ifdef HAVE_USBSTACK /* All threads should be created and public queues registered by now */ @@ -310,6 +309,8 @@ static void init(void) #ifdef DEBUG debug_init(); #endif + /* Must be done before any code uses the multi-screen API */ + gui_syncstatusbar_init(&statusbars); storage_init(); settings_reset(); settings_load(SETTINGS_ALL); @@ -431,6 +432,9 @@ static void init(void) radio_init(); #endif + /* Must be done before any code uses the multi-screen API */ + gui_syncstatusbar_init(&statusbars); + #if CONFIG_CHARGING && (CONFIG_CPU == SH7034) /* charger_inserted() can't be used here because power_thread() hasn't checked power_input_status() yet */ |