len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 02:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_4@23036 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2009-10-09 09:33:43 +00:00
parent 3a3d4aec74
commit 7b70046e7a
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
apps/main.c
View file

@ -139,7 +139,6 @@ static void app_main(void)
list_init(); list_init();
#endif #endif
tree_gui_init(); tree_gui_init();
gui_syncstatusbar_init(&statusbars);
viewportmanager_init(); viewportmanager_init();
#ifdef HAVE_USBSTACK #ifdef HAVE_USBSTACK
/* All threads should be created and public queues registered by now */ /* All threads should be created and public queues registered by now */
@ -310,6 +309,8 @@ static void init(void)
#ifdef DEBUG #ifdef DEBUG
debug_init(); debug_init();
#endif #endif
/* Must be done before any code uses the multi-screen API */
gui_syncstatusbar_init(&statusbars);
storage_init(); storage_init();
settings_reset(); settings_reset();
settings_load(SETTINGS_ALL); settings_load(SETTINGS_ALL);
@ -431,6 +432,9 @@ static void init(void)
radio_init(); radio_init();
#endif #endif
/* Must be done before any code uses the multi-screen API */
gui_syncstatusbar_init(&statusbars);
#if CONFIG_CHARGING && (CONFIG_CPU == SH7034) #if CONFIG_CHARGING && (CONFIG_CPU == SH7034)
/* charger_inserted() can't be used here because power_thread() /* charger_inserted() can't be used here because power_thread()
hasn't checked power_input_status() yet */ hasn't checked power_input_status() yet */