summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2009-09-09 15:42:20 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2009-09-09 15:42:20 +0000
commitd2645566f74dfdccce8f30489bd8494244629aef (patch)
treeea947f163ec5c841d2b6afc9038419849484196c /apps
parentbb059ab78c607aa89f908524ff3df0eadb75730e (diff)
fix the first subline not displaying properly
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22668 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/gui/skin_engine/skin_display.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/apps/gui/skin_engine/skin_display.c b/apps/gui/skin_engine/skin_display.c
index 4a87b69ce4..14e0bce0a9 100644
--- a/apps/gui/skin_engine/skin_display.c
+++ b/apps/gui/skin_engine/skin_display.c
@@ -702,11 +702,17 @@ static bool update_curr_subline(struct gui_wps *gwps, struct skin_line *line)
/* shortcut this whole thing if we need to reset the line completly */
if (line->curr_subline == NULL)
{
- int next_refresh = current_tick;
+ line->subline_expire_time = current_tick;
line->curr_subline = &line->sublines;
if (!line->curr_subline->next)
- next_refresh += 100*HZ;
- line->subline_expire_time = next_refresh;
+ {
+ line->subline_expire_time += 100*HZ;
+ }
+ else
+ {
+ get_subline_timeout(gwps, line->curr_subline);
+ line->subline_expire_time += TIMEOUT_UNIT*line->curr_subline->time_mult;
+ }
return true;
}
/* if time to advance to next sub-line */