mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-08 06:08:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

bouquets: fix segfault while re-loading channel lists

Browse Source 
Origin commit data
------------------
Commit: 940aef5e4e
Author: TangoCash <eric@loxat.de>
Date: 2021-09-17 (Fri, 17 Sep 2021)

Origin message was:
------------------
- bouquets: fix segfault while re-loading channel lists
This commit is contained in:
TangoCash
2021-09-17 20:36:22 +02:00
committed by vanhofen
parent f480b7cc24
commit e16730debc
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/driver/pictureviewer/pictureviewer.cpp
View File

@@ -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()) if (!cc->getAlternateLogo().empty())
{ {

8
src/zapit/src/bouquets.cpp
View File

@@ -990,8 +990,8 @@ void CBouquetManager::loadWebchannels(int mode)
if(!new_epgmap.empty()) if(!new_epgmap.empty())
channel->setEPGmap("#" + new_epgmap + "=" + buf); channel->setEPGmap("#" + new_epgmap + "=" + buf);
} }
std::string dummy = ""; std::string helper = "alternate_logos";
if (alogo && !g_PicViewer->GetLogoName(chid, std::string(title), dummy)) if (alogo && !g_PicViewer->GetLogoName(chid, std::string(title), helper))
{ {
channel->setAlternateLogo(std::string(alogo)); channel->setAlternateLogo(std::string(alogo));
pthread_mutex_lock (&mutex); pthread_mutex_lock (&mutex);
@@ -1128,8 +1128,8 @@ void CBouquetManager::loadWebchannels(int mode)
snprintf(buf, sizeof(buf), "%llx", chid & 0xFFFFFFFFFFFFULL); snprintf(buf, sizeof(buf), "%llx", chid & 0xFFFFFFFFFFFFULL);
channel->setEPGmap("#" + new_epgxml + "=" + buf); channel->setEPGmap("#" + new_epgxml + "=" + buf);
} }
desc = "m3u_loading_logos"; std::string helper = "alternate_logos";
if (!alogo.empty() && !g_PicViewer->GetLogoName(chid,title,desc)) if (!alogo.empty() && !g_PicViewer->GetLogoName(chid, title, helper))
{ {
channel->setAlternateLogo(alogo); channel->setAlternateLogo(alogo);
pthread_mutex_lock (&mutex); pthread_mutex_lock (&mutex);