summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorNicolas Pennequin <nicolas.pennequin@free.fr>2007-11-13 22:56:42 +0000
committerNicolas Pennequin <nicolas.pennequin@free.fr>2007-11-13 22:56:42 +0000
commitbb999f9eb3aec0aa5b693a52b70090fb5f9caaf0 (patch)
treed0ff2bb9e68aee360c2070bb4d21ebdced349ef1 /apps
parent6e06825fa09b0a8bb0f92ffe4c14ac81e9a4b28b (diff)
Check that the WPS uses album art before clearing its position on conditional. Without that check, having a conditional as very first token would cause undesired clearing. Thanks to PaulJam for spotting.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15609 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/gui/gwps-common.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c
index f1486461c9..1b63dedc4e 100644
--- a/apps/gui/gwps-common.c
+++ b/apps/gui/gwps-common.c
@@ -1426,8 +1426,11 @@ static int evaluate_conditional(struct gui_wps *gwps, int cond_index)
#endif
#ifdef HAVE_ALBUMART
- if (data->albumart_cond_index == cond_index)
+ if (data->wps_uses_albumart != WPS_ALBUMART_NONE &&
+ data->albumart_cond_index == cond_index)
+ {
draw_album_art(gwps, audio_current_aa_hid(), true);
+ }
#endif
return ret;