summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Jarosch <tomj@simonv.com>2011-12-03 16:55:04 +0000
committerThomas Jarosch <tomj@simonv.com>2011-12-03 16:55:04 +0000
commitdbcd21f3b5f77ca448615720995c9cb65bd90790 (patch)
treee9ee0ad3f6373640e7d4055c89232d65d92a5159
parent3e58faddf7093a14ad6aeb8ac9438f4306ef6e06 (diff)
downloadrockbox-dbcd21f3b5f77ca448615720995c9cb65bd90790.tar.gz
rockbox-dbcd21f3b5f77ca448615720995c9cb65bd90790.zip
Backport r30964 - Fix copy'n'paste bug in skin engine
cppcheckout reported: [apps/gui/skin_engine/skin_tokens.c:1553] -> [apps/gui/skin_engine/skin_tokens.c:1553]: (style) Same expression on both sides of '||'. git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_10@31123 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/gui/skin_engine/skin_tokens.c2
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 17c67cd8e4..acf9f6d261 100644
--- a/apps/gui/skin_engine/skin_tokens.c
+++ b/apps/gui/skin_engine/skin_tokens.c
@@ -1557,7 +1557,7 @@ const char *get_token_value(struct gui_wps *gwps,
1557 } 1557 }
1558 } 1558 }
1559 /* Special handlng for filenames because we dont want to show the prefix */ 1559 /* Special handlng for filenames because we dont want to show the prefix */
1560 if ((s->flags&F_T_MASK) == F_T_UCHARPTR || 1560 if ((s->flags&F_T_MASK) == F_T_CHARPTR ||
1561 (s->flags&F_T_MASK) == F_T_UCHARPTR) 1561 (s->flags&F_T_MASK) == F_T_UCHARPTR)
1562 { 1562 {
1563 if (s->filename_setting->prefix) 1563 if (s->filename_setting->prefix)