fix FS#10599 and do r22721 a slightly better way. the %C tag is internally converted to a different token for display and conditional check.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22726 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 8 insertions, 5 deletions

diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c
index 6d4fef5ab5..94d8eb4dc6 100644
--- a/apps/gui/skin_engine/skin_tokens.c
+++ b/apps/gui/skin_engine/skin_tokens.c
@@ -318,13 +318,16 @@ const char *get_token_value(struct gui_wps *gwps,
             return id3->comment;
 
 #ifdef HAVE_ALBUMART
-        case WPS_TOKEN_ALBUMART_DISPLAY:
-            if (!data->albumart)
-                return NULL;
-            if (audio_current_aa_hid() >= 0) {
+        case WPS_TOKEN_ALBUMART_FOUND:
+            if (data->albumart && audio_current_aa_hid() >= 0) {
                 return "C";
             }
-            data->albumart->draw = false;
+            return NULL;
+            
+        case WPS_TOKEN_ALBUMART_DISPLAY:
+            if (!data->albumart)
+                return NULL;            
+            data->albumart->draw = true;
             return NULL;
 #endif