From 173664f80a88134d7f866ecaccf97f6fe6e8f5b5 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Sun, 17 Oct 2021 17:06:49 +0200 Subject: [PATCH] Revert "second try to fix reloadchannels segfault with alternate_logos" This reverts commit f58fc736febf59018691383a3cc559ac93073c5f. --- src/driver/pictureviewer/pictureviewer.cpp | 3 +-- src/gui/streaminfo2.cpp | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/driver/pictureviewer/pictureviewer.cpp b/src/driver/pictureviewer/pictureviewer.cpp index 814b63ac0..cce817035 100644 --- a/src/driver/pictureviewer/pictureviewer.cpp +++ b/src/driver/pictureviewer/pictureviewer.cpp @@ -16,7 +16,6 @@ #include #include #include -#include #ifdef FBV_SUPPORT_GIF extern int fh_gif_getsize (const char *, int *, int *, int, int); @@ -626,7 +625,7 @@ bool CPictureViewer::GetLogoName(const uint64_t &ChannelID, const std::string &C CZapitChannel * cc = NULL; if (name.compare("alternate_logos") != 0 && ChannelID && CNeutrinoApp::getInstance()->channelList) - cc = CServiceManager::getInstance()->FindChannel(ChannelID); + cc = CNeutrinoApp::getInstance()->channelList->getChannel(ChannelID); if (cc) { diff --git a/src/gui/streaminfo2.cpp b/src/gui/streaminfo2.cpp index ee08724a3..dd65cd294 100644 --- a/src/gui/streaminfo2.cpp +++ b/src/gui/streaminfo2.cpp @@ -1127,7 +1127,7 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos) CZapitChannel * cc = NULL; if (channel->getChannelID() & 0xFFFFFFFFFFFFULL) if (CNeutrinoApp::getInstance()->channelList) - cc = CServiceManager::getInstance()->FindChannel(channel->getChannelID()); + cc = CNeutrinoApp::getInstance()->channelList->getChannel(channel->getChannelID()); if (cc) {