diff options
author | Dave Chapman <dave@dchapman.com> | 2008-03-26 19:07:39 +0000 |
---|---|---|
committer | Dave Chapman <dave@dchapman.com> | 2008-03-26 19:07:39 +0000 |
commit | fa1da20d3ad9bee803eb267de89cecfdc6d6b68f (patch) | |
tree | 216fe52a2c9b2cf50cce2023507b4c8f9afede7b | |
parent | b9bb723f12c95f2b253f822bc9dc9d7f474f8d75 (diff) | |
download | rockbox-fa1da20d3ad9bee803eb267de89cecfdc6d6b68f.tar.gz rockbox-fa1da20d3ad9bee803eb267de89cecfdc6d6b68f.zip |
Fix yellow, and at the same time simplify some #ifdefs
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16823 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/gui/wps_parser.c | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/apps/gui/wps_parser.c b/apps/gui/wps_parser.c index 55b4ed9cae..c645728516 100644 --- a/apps/gui/wps_parser.c +++ b/apps/gui/wps_parser.c @@ -1429,17 +1429,24 @@ static bool load_wps_bitmaps(struct wps_data *wps_data, char *bmpdir) { get_image_filename(bmp_names[BACKDROP_BMP], bmpdir, img_path, sizeof(img_path)); -#ifdef HAVE_REMOTE_LCD - if (wps_data->remote_wps) -#if LCD_REMOTE_DEPTH > 1 - if (!load_remote_wps_backdrop(img_path)) - return false + +#if defined(HAVE_REMOTE_LCD) + /* We only need to check LCD type if there is a remote LCD */ + if (!wps_data->remote_wps) #endif - ; - else -#endif /* HAVE_REMOTE_LCD */ + { + /* Load backdrop for the main LCD */ if (!load_wps_backdrop(img_path)) return false; + } +#if defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1 + else + { + /* Load backdrop for the remote LCD */ + if (!load_remote_wps_backdrop(img_path)) + return false; + } +#endif } #endif /* has backdrop support */ |