len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix a bug where the conditional use of %C (i.e. %?C) caused the album art to draw (noticed in FS#10596).

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22721 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2009-09-17 21:01:32 +00:00
parent 5bd3b443ff
commit 7b6265edf5
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
apps/gui/skin_engine/skin_display.c
View file

@ -474,13 +474,6 @@ static bool evaluate_conditional(struct gui_wps *gwps, int *token_index)
/* clear all pictures in the conditional and nested ones */ /* clear all pictures in the conditional and nested ones */
if (data->tokens[i].type == WPS_TOKEN_IMAGE_PRELOAD_DISPLAY) if (data->tokens[i].type == WPS_TOKEN_IMAGE_PRELOAD_DISPLAY)
clear_image_pos(gwps, find_image(data->tokens[i].value.i&0xFF, gwps->data)); 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 #endif
} }
@ -629,6 +622,14 @@ static bool get_line(struct gui_wps *gwps,
} }
} }
break; break;
#ifdef HAVE_ALBUMART
case WPS_TOKEN_ALBUMART_DISPLAY:
if (data->albumart)
{
data->albumart->draw = true;
}
break;
#endif
default: default:
{ {
/* get the value of the tag and copy it to the buffer */ /* get the value of the tag and copy it to the buffer */

1
apps/gui/skin_engine/skin_tokens.c
View file

@ -322,7 +322,6 @@ const char *get_token_value(struct gui_wps *gwps,
if (!data->albumart) if (!data->albumart)
return NULL; return NULL;
if (audio_current_aa_hid() >= 0) { if (audio_current_aa_hid() >= 0) {
data->albumart->draw = true;
return "C"; return "C";
} }
data->albumart->draw = false; data->albumart->draw = false;