summaryrefslogtreecommitdiff
path: root/apps/gui
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2006-06-21 18:41:57 +0000
committerJens Arnold <amiconn@rockbox.org>2006-06-21 18:41:57 +0000
commitc129f215864cfb07b3a7563053fd680e8e31ff2d (patch)
tree425094eb36353013639c1acf723250b370bd7f1e /apps/gui
parent75117cc993442303009f64b7c1951cfa7dbe1887 (diff)
downloadrockbox-c129f215864cfb07b3a7563053fd680e8e31ff2d.zip
rockbox-c129f215864cfb07b3a7563053fd680e8e31ff2d.tar.gz
rockbox-c129f215864cfb07b3a7563053fd680e8e31ff2d.tar.bz2
rockbox-c129f215864cfb07b3a7563053fd680e8e31ff2d.tar.xz
Ondio, iPods (except video): Fix disappearing volume icon when plugging USB power.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10142 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui')
-rw-r--r--apps/gui/statusbar.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/apps/gui/statusbar.c b/apps/gui/statusbar.c
index b5d8b7c..cceb54e 100644
--- a/apps/gui/statusbar.c
+++ b/apps/gui/statusbar.c
@@ -222,10 +222,12 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw)
STATUSBAR_PLUG_X_POS,
STATUSBAR_Y_POS, STATUSBAR_PLUG_WIDTH,
STATUSBAR_HEIGHT);
- else
#endif /* HAVE_USB_POWER */
- /* draw power plug if charging */
#ifdef CONFIG_CHARGING
+#ifdef HAVE_USB_POWER
+ else
+#endif
+ /* draw power plug if charging */
if (bar->info.inserted)
display->mono_bitmap(bitmap_icons_7x8[Icon_Plug],
STATUSBAR_PLUG_X_POS,
@@ -234,8 +236,7 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw)
#endif
bar->redraw_volume = gui_statusbar_icon_volume(bar, bar->info.volume);
- gui_statusbar_icon_play_state(display, current_playmode() +
- Icon_Play);
+ gui_statusbar_icon_play_state(display, current_playmode() + Icon_Play);
switch (bar->info.repeat) {
#if (AB_REPEAT_ENABLE == 1)