summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2009-10-09 09:33:43 +0000
committerJens Arnold <amiconn@rockbox.org>2009-10-09 09:33:43 +0000
commit7b70046e7ab7329d93f800fe4b074fabff998a0e (patch)
tree81b81008c4cb69c276329ecd50200887c4da4838
parent3a3d4aec74924a1aadc05f52cad34f67656012e0 (diff)
downloadrockbox-7b70046e7ab7329d93f800fe4b074fabff998a0e.tar.gz
rockbox-7b70046e7ab7329d93f800fe4b074fabff998a0e.zip
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/branches/v3_4@23036 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/main.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/apps/main.c b/apps/main.c
index c7510801d4..a93231e036 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -139,7 +139,6 @@ static void app_main(void)
139 list_init(); 139 list_init();
140#endif 140#endif
141 tree_gui_init(); 141 tree_gui_init();
142 gui_syncstatusbar_init(&statusbars);
143 viewportmanager_init(); 142 viewportmanager_init();
144#ifdef HAVE_USBSTACK 143#ifdef HAVE_USBSTACK
145 /* All threads should be created and public queues registered by now */ 144 /* All threads should be created and public queues registered by now */
@@ -310,6 +309,8 @@ static void init(void)
310#ifdef DEBUG 309#ifdef DEBUG
311 debug_init(); 310 debug_init();
312#endif 311#endif
312 /* Must be done before any code uses the multi-screen API */
313 gui_syncstatusbar_init(&statusbars);
313 storage_init(); 314 storage_init();
314 settings_reset(); 315 settings_reset();
315 settings_load(SETTINGS_ALL); 316 settings_load(SETTINGS_ALL);
@@ -431,6 +432,9 @@ static void init(void)
431 radio_init(); 432 radio_init();
432#endif 433#endif
433 434
435 /* Must be done before any code uses the multi-screen API */
436 gui_syncstatusbar_init(&statusbars);
437
434#if CONFIG_CHARGING && (CONFIG_CPU == SH7034) 438#if CONFIG_CHARGING && (CONFIG_CPU == SH7034)
435 /* charger_inserted() can't be used here because power_thread() 439 /* charger_inserted() can't be used here because power_thread()
436 hasn't checked power_input_status() yet */ 440 hasn't checked power_input_status() yet */