diff --git a/src/driver/pictureviewer/pictureviewer.cpp b/src/driver/pictureviewer/pictureviewer.cpp index d42b6f606..439518cf7 100644 --- a/src/driver/pictureviewer/pictureviewer.cpp +++ b/src/driver/pictureviewer/pictureviewer.cpp @@ -499,6 +499,7 @@ void CPictureViewer::getSize(const char* name, int* width, int *height) } #define LOGO_FLASH_DIR DATADIR "/neutrino/icons/logo" +#define LOGO_FLASH_DIR_VAR "/var/tuxbox/icons/logo" bool CPictureViewer::GetLogoName(const uint64_t& channel_id, const std::string& ChannelName, std::string & name, int *width, int *height) { @@ -523,6 +524,16 @@ bool CPictureViewer::GetLogoName(const uint64_t& channel_id, const std::string& id_tmp_path += strChnId + fileType[i]; v_path.push_back(id_tmp_path); + //create filename with channel name (LOGO_FLASH_DIR_VAR) + id_tmp_path = LOGO_FLASH_DIR_VAR "/"; + id_tmp_path += ChannelName + fileType[i]; + v_path.push_back(id_tmp_path); + + //create filename with id (LOGO_FLASH_DIR_VAR) + id_tmp_path = LOGO_FLASH_DIR_VAR "/"; + id_tmp_path += strChnId + fileType[i]; + v_path.push_back(id_tmp_path); + //create filename with channel name (LOGO_FLASH_DIR) id_tmp_path = LOGO_FLASH_DIR "/"; id_tmp_path += ChannelName + fileType[i];