summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2011-09-04 13:23:40 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2011-09-04 13:23:40 +0000
commit642736f53b153f544dc60bb5d7ff4f147ec760b4 (patch)
treeb215aba1800fc20479bdd7b26dda3d7a7db5adae
parent89973217774f93f8dabcf41a559a5910b7b27f64 (diff)
downloadrockbox-642736f53b153f544dc60bb5d7ff4f147ec760b4.zip
rockbox-642736f53b153f544dc60bb5d7ff4f147ec760b4.tar.gz
rockbox-642736f53b153f544dc60bb5d7ff4f147ec760b4.tar.bz2
rockbox-642736f53b153f544dc60bb5d7ff4f147ec760b4.tar.xz
fix error, none of this code is needed or would work in the checkwps program anyway
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30429 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/gui/skin_engine/skin_parser.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c
index adac487..58ac5f5 100644
--- a/apps/gui/skin_engine/skin_parser.c
+++ b/apps/gui/skin_engine/skin_parser.c
@@ -1140,6 +1140,7 @@ static const struct touchaction touchactions[] = {
static int touchregion_setup_setting(struct skin_element *element, int param_no,
struct touchregion *region)
{
+#ifndef __PCTOOL__
int p = param_no;
char *name = element->params[p++].data.text;
int j;
@@ -1147,6 +1148,7 @@ static int touchregion_setup_setting(struct skin_element *element, int param_no,
region->setting_data.setting = find_setting_by_cfgname(name, &j);
if (region->setting_data.setting == NULL)
return WPS_ERROR_INVALID_PARAM;
+
if (region->action == ACTION_SETTINGS_SET)
{
char* text;
@@ -1155,7 +1157,7 @@ static int touchregion_setup_setting(struct skin_element *element, int param_no,
&region->setting_data;
if (element->params_count < p+1)
return -1;
-#ifndef __PCTOOL__
+
text = element->params[p++].data.text;
switch (settings[j].flags&F_T_MASK)
{
@@ -1190,9 +1192,10 @@ static int touchregion_setup_setting(struct skin_element *element, int param_no,
default:
return -1;
}
-#endif /* __PCTOOL__ */
}
return p-param_no;
+#endif /* __PCTOOL__ */
+ return 0;
}
static int parse_touchregion(struct skin_element *element,