diff options
| author | Jonathan Gordon <rockbox@jdgordon.info> | 2010-08-10 14:15:03 +0000 |
|---|---|---|
| committer | Jonathan Gordon <rockbox@jdgordon.info> | 2010-08-10 14:15:03 +0000 |
| commit | 489962dc4e34cc89c2bf9d124feb74954eb92c68 (patch) | |
| tree | ef53892652379e43dde6dd013a2ad5081a718d25 /apps/gui | |
| parent | a547fc1b351f98f620ba61e240ebbf0729727e1c (diff) | |
| download | rockbox-489962dc4e34cc89c2bf9d124feb74954eb92c68.zip rockbox-489962dc4e34cc89c2bf9d124feb74954eb92c68.tar.gz rockbox-489962dc4e34cc89c2bf9d124feb74954eb92c68.tar.bz2 rockbox-489962dc4e34cc89c2bf9d124feb74954eb92c68.tar.xz | |
Fix FS#11526 - %Vf(<hex>) was acceptable on grey remotes with colour main
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27768 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui')
| -rw-r--r-- | apps/gui/skin_engine/skin_parser.c | 2 | ||||
| -rw-r--r-- | apps/gui/wps.c | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c index c5acd1f..94953f0 100644 --- a/apps/gui/skin_engine/skin_parser.c +++ b/apps/gui/skin_engine/skin_parser.c @@ -400,7 +400,7 @@ static int parse_viewportcolour(struct skin_element *element, } else { - if (!parse_color(param->data.text, &colour->colour)) + if (!parse_color(curr_screen, param->data.text, &colour->colour)) return -1; } colour->vp = &curr_vp->vp; diff --git a/apps/gui/wps.c b/apps/gui/wps.c index 508446a..6ab016f 100644 --- a/apps/gui/wps.c +++ b/apps/gui/wps.c @@ -655,10 +655,14 @@ static void gwps_enter_wps(void) #if LCD_DEPTH > 1 if (display->depth > 1) { - struct viewport *vp = &find_viewport(VP_DEFAULT_LABEL, - false, gwps->data)->vp; - vp->fg_pattern = display->get_foreground(); - vp->bg_pattern = display->get_background(); + struct skin_viewport *svp = find_viewport(VP_DEFAULT_LABEL, + false, gwps->data); + if (svp) + { + struct viewport *vp = &svp->vp; + vp->fg_pattern = display->get_foreground(); + vp->bg_pattern = display->get_background(); + } } #endif /* make the backdrop actually take effect */ |