diff options
| author | Teruaki Kawashima <teru@rockbox.org> | 2010-03-07 13:39:19 +0000 |
|---|---|---|
| committer | Teruaki Kawashima <teru@rockbox.org> | 2010-03-07 13:39:19 +0000 |
| commit | ce92b8bf34bcd790dad7f36152520d9fec687073 (patch) | |
| tree | 4a450f01d2a2615a18f9ac04a33a5b28ef8e65e7 | |
| parent | f50885534ec6fa78c2c89e275c5ffd592be5cd2e (diff) | |
| download | rockbox-ce92b8bf34bcd790dad7f36152520d9fec687073.zip rockbox-ce92b8bf34bcd790dad7f36152520d9fec687073.tar.gz rockbox-ce92b8bf34bcd790dad7f36152520d9fec687073.tar.bz2 rockbox-ce92b8bf34bcd790dad7f36152520d9fec687073.tar.xz | |
Slightly change how %Li works when used as a conditional. last part is selected if and only if icon is not presented (i.e. is no icon) so that it can be used like true/false type conditional tag, e.g. "%?Li<Icon|No Icon>".
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25054 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/gui/skin_engine/skin_tokens.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c index 486a2ef..2cd5aae 100644 --- a/apps/gui/skin_engine/skin_tokens.c +++ b/apps/gui/skin_engine/skin_tokens.c @@ -418,7 +418,7 @@ const char *get_token_value(struct gui_wps *gwps, return (char*)token->value.data; case WPS_TOKEN_LIST_TITLE_ICON: if (intval) - *intval = token->value.i; + *intval = MIN(token->value.i, limit-1); snprintf(buf, buf_size, "%d", token->value.i); return buf; |