From e60de9e5bb8059eefc0a5b6330738188850c5a4e Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Fri, 13 Aug 2010 15:09:20 +0000 Subject: [PATCH] Fix backdrops from sbs not being loaded correctly (caused by r27791). git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27802 a1c6a512-1295-4272-9138-f99709370657 --- apps/gui/skin_engine/skin_backdrops.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/gui/skin_engine/skin_backdrops.c b/apps/gui/skin_engine/skin_backdrops.c index 44270a9cbd..9ceee0cd05 100644 --- a/apps/gui/skin_engine/skin_backdrops.c +++ b/apps/gui/skin_engine/skin_backdrops.c @@ -53,7 +53,6 @@ char* skin_backdrop_load(char* backdrop, char *bmpdir, enum screen_type screen) int i; struct skin_backdrop *bdrop = NULL; char dir[MAX_PATH]; - const char *backdrop_dir = get_user_file_path(bmpdir, 0, dir, sizeof(dir)); char filename[MAX_PATH]; size_t buf_size; bool loaded = false; @@ -80,12 +79,14 @@ char* skin_backdrop_load(char* backdrop, char *bmpdir, enum screen_type screen) return NULL; /* backdrop setting not set */ } snprintf(filename, sizeof(filename), "%s/%s.bmp", - backdrop_dir, global_settings.backdrop_file); + get_user_file_path(BACKDROP_DIR, 0, dir, sizeof(dir)), + global_settings.backdrop_file); } } else { - get_image_filename(backdrop, backdrop_dir, filename, sizeof(filename)); + const char *bd_dir = get_user_file_path(bmpdir, 0, dir, sizeof(dir)); + get_image_filename(backdrop, bd_dir, filename, sizeof(filename)); } for(i=0;i