summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-rw-r--r--apps/gui/gwps-common.c9
-rw-r--r--apps/gui/wps_parser.c7
2 files changed, 9 insertions, 7 deletions
diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c
index 7e38a08615..6307fed157 100644
--- a/apps/gui/gwps-common.c
+++ b/apps/gui/gwps-common.c
@@ -1396,6 +1396,10 @@ static bool get_line(struct gui_wps *gwps,
i = find_conditional_end(data, i);
break;
+ case WPS_TOKEN_SUBLINE_TIMEOUT:
+ data->time_mult[line][subline] = data->tokens[i].value.i;
+ break;
+
#ifdef HAVE_LCD_BITMAP
case WPS_TOKEN_IMAGE_PRELOAD_DISPLAY:
{
@@ -1759,9 +1763,14 @@ bool gui_wps_refresh(struct gui_wps *gwps,
/* reset to first subline if refresh all flag is set */
if (refresh_mode == WPS_REFRESH_ALL)
{
+ int j;
for (i = 0; i < data->num_lines; i++)
{
data->curr_subline[i] = SUBLINE_RESET;
+ for (j = 0; j < data->num_sublines[i]; j++)
+ {
+ data->time_mult[i][j] = DEFAULT_SUBLINE_TIME_MULTIPLIER;
+ }
}
}
diff --git a/apps/gui/wps_parser.c b/apps/gui/wps_parser.c
index 07a1df64ac..321286fd05 100644
--- a/apps/gui/wps_parser.c
+++ b/apps/gui/wps_parser.c
@@ -493,13 +493,6 @@ static int parse_subline_timeout(const char *wps_token, struct wps_data *wps_dat
if (have_tenth == false)
val *= 10;
- if (val > 0)
- {
- int line = wps_data->num_lines;
- int subline = wps_data->num_sublines[line];
- wps_data->time_mult[line][subline] = val;
- }
-
wps_data->tokens[wps_data->num_tokens].value.i = val;
return skip;
}