summaryrefslogtreecommitdiff
path: root/apps/gui
diff options
context:
space:
mode:
Diffstat (limited to 'apps/gui')
-rw-r--r--apps/gui/skin_engine/skin_tokens.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c
index ddc2221..f455999 100644
--- a/apps/gui/skin_engine/skin_tokens.c
+++ b/apps/gui/skin_engine/skin_tokens.c
@@ -563,17 +563,15 @@ static struct mp3entry* get_mp3entry_from_offset(int offset, char **filename)
fname = playlist_peek(offset, filename_buf, sizeof(filename_buf));
*filename = (char*)fname;
#if CONFIG_CODEC == SWCODEC
-#if defined(HAVE_TC_RAMCACHE) && defined(HAVE_DIRCACHE)
static struct mp3entry tempid3;
- if (tagcache_fill_tags(&tempid3, fname))
- {
- pid3 = &tempid3;
- }
- else
+ if (
+#if defined(HAVE_TC_RAMCACHE) && defined(HAVE_DIRCACHE)
+ tagcache_fill_tags(&tempid3, fname) ||
#endif
+ audio_peek_track(&tempid3, offset)
+ )
{
- if (!audio_peek_track(&pid3, offset))
- pid3 = NULL;
+ pid3 = &tempid3;
}
#endif
}