mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 07:23:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

-webtv: fix segfault while reload

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
TangoCash
2018-09-24 21:19:37 +02:00
committed by Thilo Graf
parent 1d7d780258
commit 1473bca983
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -660,7 +660,7 @@ bool CPictureViewer::GetLogoName(const uint64_t& channel_id, const std::string&
} }
} }
if (cc) if (cc && (name.compare("m3u_loading_logos") != 0))
{ {
if (!cc->getAlternateLogo().empty()) if (!cc->getAlternateLogo().empty())
{ {

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

@@ -1050,6 +1050,7 @@ void CBouquetManager::loadWebchannels(int mode)
} }
CZapitChannel * channel = new CZapitChannel(title.c_str(), chid, url, desc.c_str(), chid, epg_script.c_str(), mode); CZapitChannel * channel = new CZapitChannel(title.c_str(), chid, url, desc.c_str(), chid, epg_script.c_str(), mode);
CServiceManager::getInstance()->AddChannel(channel); CServiceManager::getInstance()->AddChannel(channel);
desc = "m3u_loading_logos";
if (!alogo.empty() && !g_PicViewer->GetLogoName(chid,title,desc)) if (!alogo.empty() && !g_PicViewer->GetLogoName(chid,title,desc))
{ {
channel->setAlternateLogo(alogo); channel->setAlternateLogo(alogo);