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

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;