summaryrefslogtreecommitdiff
path: root/libcore/imageloader.c
diff options
context:
space:
mode:
Diffstat (limited to 'libcore/imageloader.c')
-rw-r--r--libcore/imageloader.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/libcore/imageloader.c b/libcore/imageloader.c
index 1b220a6..61e8076 100644
--- a/libcore/imageloader.c
+++ b/libcore/imageloader.c
@@ -27,7 +27,13 @@ bool cImageLoader::LoadImage(const char *path, int width, int height) {
}
void cImageLoader::DeterminateChannelLogoSize(int &width, int &height) {
- cString logoPath = cString::sprintf("%s%s/logos/", *config.skinPath, Setup.OSDTheme);
+ cString logoPath;
+ cString logoPathSkin = cString::sprintf("%s%s/themes/%s/logos/", *config.skinPath, Setup.OSDSkin, Setup.OSDTheme);
+ if (FolderExists(*logoPathSkin)) {
+ logoPath = logoPathSkin;
+ } else {
+ logoPath = config.logoPath;
+ }
cString logoExt = config.logoExtension;
DIR *folder = NULL;
struct dirent *file;