diff options
author | Nicolas Pennequin <nicolas.pennequin@free.fr> | 2007-11-13 22:56:42 +0000 |
---|---|---|
committer | Nicolas Pennequin <nicolas.pennequin@free.fr> | 2007-11-13 22:56:42 +0000 |
commit | bb999f9eb3aec0aa5b693a52b70090fb5f9caaf0 (patch) | |
tree | d0ff2bb9e68aee360c2070bb4d21ebdced349ef1 | |
parent | 6e06825fa09b0a8bb0f92ffe4c14ac81e9a4b28b (diff) | |
download | rockbox-bb999f9eb3aec0aa5b693a52b70090fb5f9caaf0.tar.gz rockbox-bb999f9eb3aec0aa5b693a52b70090fb5f9caaf0.zip |
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
-rw-r--r-- | apps/gui/gwps-common.c | 5 |
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) | |||
1426 | #endif | 1426 | #endif |
1427 | 1427 | ||
1428 | #ifdef HAVE_ALBUMART | 1428 | #ifdef HAVE_ALBUMART |
1429 | if (data->albumart_cond_index == cond_index) | 1429 | if (data->wps_uses_albumart != WPS_ALBUMART_NONE && |
1430 | data->albumart_cond_index == cond_index) | ||
1431 | { | ||
1430 | draw_album_art(gwps, audio_current_aa_hid(), true); | 1432 | draw_album_art(gwps, audio_current_aa_hid(), true); |
1433 | } | ||
1431 | #endif | 1434 | #endif |
1432 | 1435 | ||
1433 | return ret; | 1436 | return ret; |