diff --git a/src/driver/pictureviewer/pictureviewer.cpp b/src/driver/pictureviewer/pictureviewer.cpp index 13480539c..94b21e56f 100644 --- a/src/driver/pictureviewer/pictureviewer.cpp +++ b/src/driver/pictureviewer/pictureviewer.cpp @@ -703,7 +703,8 @@ bool CPictureViewer::GetLogoName(const uint64_t &ChannelID, const std::string &C } } - if (cc && (name.compare("m3u_loading_logos") != 0)) + // "alternate_logos" is a helper string from zapit/src/bouquets.cpp + if (cc && (name.compare("alternate_logos") != 0)) { if (!cc->getAlternateLogo().empty()) { diff --git a/src/zapit/src/bouquets.cpp b/src/zapit/src/bouquets.cpp index 4a1da81d4..6c0ebc218 100644 --- a/src/zapit/src/bouquets.cpp +++ b/src/zapit/src/bouquets.cpp @@ -990,8 +990,8 @@ void CBouquetManager::loadWebchannels(int mode) if(!new_epgmap.empty()) channel->setEPGmap("#" + new_epgmap + "=" + buf); } - std::string dummy = ""; - if (alogo && !g_PicViewer->GetLogoName(chid, std::string(title), dummy)) + std::string helper = "alternate_logos"; + if (alogo && !g_PicViewer->GetLogoName(chid, std::string(title), helper)) { channel->setAlternateLogo(std::string(alogo)); pthread_mutex_lock (&mutex); @@ -1128,8 +1128,8 @@ void CBouquetManager::loadWebchannels(int mode) snprintf(buf, sizeof(buf), "%llx", chid & 0xFFFFFFFFFFFFULL); channel->setEPGmap("#" + new_epgxml + "=" + buf); } - desc = "m3u_loading_logos"; - if (!alogo.empty() && !g_PicViewer->GetLogoName(chid,title,desc)) + std::string helper = "alternate_logos"; + if (!alogo.empty() && !g_PicViewer->GetLogoName(chid, title, helper)) { channel->setAlternateLogo(alogo); pthread_mutex_lock (&mutex);