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, 7 insertions, 8 deletions

diff --git a/apps/gui/skin_engine/skin_display.c b/apps/gui/skin_engine/skin_display.c
index 762b7f78a6..e24ab66393 100644
--- a/apps/gui/skin_engine/skin_display.c
+++ b/apps/gui/skin_engine/skin_display.c
@@ -475,6 +475,13 @@ static bool evaluate_conditional(struct gui_wps *gwps, int *token_index)
         if (data->tokens[i].type == WPS_TOKEN_IMAGE_PRELOAD_DISPLAY)
             clear_image_pos(gwps, find_image(data->tokens[i].value.i&0xFF, gwps->data));
 #endif
+#ifdef HAVE_ALBUMART
+        if (data->albumart && data->tokens[i].type == WPS_TOKEN_ALBUMART_DISPLAY)
+        {
+            draw_album_art(gwps, audio_current_aa_hid(), true);
+            data->albumart->draw = false;
+        }
+#endif
     }
 
     return true;
@@ -622,14 +629,6 @@ static bool get_line(struct gui_wps *gwps,
                 }
             }
                 break;
-#ifdef HAVE_ALBUMART
-            case WPS_TOKEN_ALBUMART_DISPLAY:
-                if (data->albumart)
-                {
-                    data->albumart->draw = true;
-                }
-                break;
-#endif
             default:
             {
                 /* get the value of the tag and copy it to the buffer */