diff options
author | Thomas Martitz <kugel@rockbox.org> | 2009-11-10 20:13:24 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2009-11-10 20:13:24 +0000 |
commit | c5b4482ee2468c0e40da4441ddf429c890b5a291 (patch) | |
tree | f24461e5db3690c5b69caf48710f61c542c961f4 /apps/gui/viewport.c | |
parent | 422fcbe35d93d2ea35695b8f746e0652ee1796ad (diff) | |
download | rockbox-c5b4482ee2468c0e40da4441ddf429c890b5a291.tar.gz rockbox-c5b4482ee2468c0e40da4441ddf429c890b5a291.zip |
Revert r23599 and r23600 and fix the early usb problem at the root. The the viewportmanager and custom statusbar was initialized too late.
Now, call it earlier and remove parts of it that caused the need to call it later. Removing that is OK since it's done again on settings loading.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23603 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui/viewport.c')
-rw-r--r-- | apps/gui/viewport.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/apps/gui/viewport.c b/apps/gui/viewport.c index 063f59cec6..5f999df961 100644 --- a/apps/gui/viewport.c +++ b/apps/gui/viewport.c | |||
@@ -104,12 +104,7 @@ static bool showing_bars(enum screen_type screen) | |||
104 | void viewportmanager_init(void) | 104 | void viewportmanager_init(void) |
105 | { | 105 | { |
106 | #ifdef HAVE_LCD_BITMAP | 106 | #ifdef HAVE_LCD_BITMAP |
107 | int retval, i; | ||
108 | add_event(GUI_EVENT_STATUSBAR_TOGGLE, false, statusbar_toggled); | 107 | add_event(GUI_EVENT_STATUSBAR_TOGGLE, false, statusbar_toggled); |
109 | retval = viewport_init_ui_vp(); | ||
110 | FOR_NB_SCREENS(i) | ||
111 | ui_vp_info.active[i] = retval & BIT_N(i); | ||
112 | ui_vp_info.vp = custom_vp; | ||
113 | #endif | 108 | #endif |
114 | viewportmanager_set_statusbar(VP_SB_ALLSCREENS); | 109 | viewportmanager_set_statusbar(VP_SB_ALLSCREENS); |
115 | } | 110 | } |