From 1473bca983f508b0281cf56c3340a7bc12f096d6 Mon Sep 17 00:00:00 2001 From: TangoCash Date: Mon, 24 Sep 2018 21:19:37 +0200 Subject: [PATCH] -webtv: fix segfault while reload Signed-off-by: Thilo Graf --- src/driver/pictureviewer/pictureviewer.cpp | 2 +- src/zapit/src/bouquets.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/driver/pictureviewer/pictureviewer.cpp b/src/driver/pictureviewer/pictureviewer.cpp index fc414d806..4ca86d02e 100644 --- a/src/driver/pictureviewer/pictureviewer.cpp +++ b/src/driver/pictureviewer/pictureviewer.cpp @@ -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()) { diff --git a/src/zapit/src/bouquets.cpp b/src/zapit/src/bouquets.cpp index 9f3f2dd85..54639142f 100644 --- a/src/zapit/src/bouquets.cpp +++ b/src/zapit/src/bouquets.cpp @@ -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); CServiceManager::getInstance()->AddChannel(channel); + desc = "m3u_loading_logos"; if (!alogo.empty() && !g_PicViewer->GetLogoName(chid,title,desc)) { channel->setAlternateLogo(alogo);