From aafeaad65f3e3921cdb16e30098422f2afd84146 Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Fri, 18 Sep 2009 05:15:18 +0000 Subject: 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 --- apps/gui/skin_engine/skin_parser.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'apps/gui/skin_engine/skin_parser.c') diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c index 7d37e1972c..3717dadd48 100644 --- a/apps/gui/skin_engine/skin_parser.c +++ b/apps/gui/skin_engine/skin_parser.c @@ -1120,8 +1120,15 @@ static int parse_albumart_display(const char *wps_bufptr, struct wps_data *wps_data) { (void)wps_bufptr; - (void)token; - if (wps_data->albumart) + if (wps_data->num_tokens > 1) + { + struct wps_token *prev = token-1; + if (prev->type == WPS_TOKEN_CONDITIONAL) + { + token->type = WPS_TOKEN_ALBUMART_FOUND; + } + } + else if (wps_data->albumart) { wps_data->albumart->vp = &curr_vp->vp; } -- cgit v1.2.3