diff options
Diffstat (limited to 'apps/main.c')
-rw-r--r-- | apps/main.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/apps/main.c b/apps/main.c index d0fba3fcce..49542e8b01 100644 --- a/apps/main.c +++ b/apps/main.c | |||
@@ -72,6 +72,7 @@ | |||
72 | #include "eeprom_settings.h" | 72 | #include "eeprom_settings.h" |
73 | #include "scrobbler.h" | 73 | #include "scrobbler.h" |
74 | #include "icon.h" | 74 | #include "icon.h" |
75 | #include "viewport.h" | ||
75 | 76 | ||
76 | #ifdef IPOD_ACCESSORY_PROTOCOL | 77 | #ifdef IPOD_ACCESSORY_PROTOCOL |
77 | #include "iap.h" | 78 | #include "iap.h" |
@@ -135,9 +136,8 @@ static void app_main(void) | |||
135 | screens[i].update(); | 136 | screens[i].update(); |
136 | } | 137 | } |
137 | tree_gui_init(); | 138 | tree_gui_init(); |
138 | viewportmanager_set_statusbar(VP_SB_ALLSCREENS); | 139 | gui_syncstatusbar_init(&statusbars); |
139 | add_event(GUI_EVENT_STATUSBAR_TOGGLE, false, | 140 | viewportmanager_init(); |
140 | viewportmanager_statusbar_changed); | ||
141 | #ifdef HAVE_USBSTACK | 141 | #ifdef HAVE_USBSTACK |
142 | /* All threads should be created and public queues registered by now */ | 142 | /* All threads should be created and public queues registered by now */ |
143 | usb_start_monitoring(); | 143 | usb_start_monitoring(); |
@@ -296,8 +296,6 @@ static void init(void) | |||
296 | #ifdef DEBUG | 296 | #ifdef DEBUG |
297 | debug_init(); | 297 | debug_init(); |
298 | #endif | 298 | #endif |
299 | /* Must be done before any code uses the multi-screen APi */ | ||
300 | gui_syncstatusbar_init(&statusbars); | ||
301 | storage_init(); | 299 | storage_init(); |
302 | settings_reset(); | 300 | settings_reset(); |
303 | settings_load(SETTINGS_ALL); | 301 | settings_load(SETTINGS_ALL); |
@@ -419,9 +417,6 @@ static void init(void) | |||
419 | radio_init(); | 417 | radio_init(); |
420 | #endif | 418 | #endif |
421 | 419 | ||
422 | /* Must be done before any code uses the multi-screen APi */ | ||
423 | gui_syncstatusbar_init(&statusbars); | ||
424 | |||
425 | #if CONFIG_CHARGING && (CONFIG_CPU == SH7034) | 420 | #if CONFIG_CHARGING && (CONFIG_CPU == SH7034) |
426 | /* charger_inserted() can't be used here because power_thread() | 421 | /* charger_inserted() can't be used here because power_thread() |
427 | hasn't checked power_input_status() yet */ | 422 | hasn't checked power_input_status() yet */ |