summaryrefslogtreecommitdiff
path: root/apps/gui
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2005-11-21 18:39:18 +0000
committerJens Arnold <amiconn@rockbox.org>2005-11-21 18:39:18 +0000
commitbccfae0a58515e489c3aa7f412154db56ae205d6 (patch)
treee541651d8cd61b1ddd44e4860a6c7e5a8784901e /apps/gui
parentf839ccb36fb40bb81e88ebca1f0ce6f572b01a51 (diff)
downloadrockbox-bccfae0a58515e489c3aa7f412154db56ae205d6.zip
rockbox-bccfae0a58515e489c3aa7f412154db56ae205d6.tar.gz
rockbox-bccfae0a58515e489c3aa7f412154db56ae205d6.tar.bz2
rockbox-bccfae0a58515e489c3aa7f412154db56ae205d6.tar.xz
Fixed crash with early USB. The USB screen already uses some of the new GUI code, so we have to init before. Fixed problem with gui_syncstatusbar_init() drawing the status bar(s) right away.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8030 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui')
-rw-r--r--apps/gui/statusbar.c7
-rw-r--r--apps/gui/statusbar.h3
2 files changed, 2 insertions, 8 deletions
diff --git a/apps/gui/statusbar.c b/apps/gui/statusbar.c
index 70fe77f..eec031f 100644
--- a/apps/gui/statusbar.c
+++ b/apps/gui/statusbar.c
@@ -95,13 +95,6 @@ void gui_statusbar_init(struct gui_statusbar * bar)
#endif
}
-void gui_statusbar_set_screen(struct gui_statusbar * bar,
- struct screen * display)
-{
- bar->display = display;
- gui_statusbar_draw(bar, false);
-}
-
void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw)
{
struct screen * display = bar->display;
diff --git a/apps/gui/statusbar.h b/apps/gui/statusbar.h
index 77ceefd..e7fe92e 100644
--- a/apps/gui/statusbar.h
+++ b/apps/gui/statusbar.h
@@ -85,7 +85,8 @@ extern void gui_statusbar_init(struct gui_statusbar * bar);
* - bar : the statusbar structure
* - display : the screen to attach
*/
-extern void gui_statusbar_set_screen(struct gui_statusbar * bar, struct screen * display);
+#define gui_statusbar_set_screen(gui_statusbar, screen) \
+ (gui_statusbar)->display = screen
/*
* Draws the status bar on the attached screen