From f58fc736febf59018691383a3cc559ac93073c5f Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Sun, 17 Oct 2021 15:58:20 +0200 Subject: [PATCH] second try to fix reloadchannels segfault with alternate_logos --- src/driver/pictureviewer/pictureviewer.cpp | 3 ++- src/gui/streaminfo2.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/driver/pictureviewer/pictureviewer.cpp b/src/driver/pictureviewer/pictureviewer.cpp index cce817035..814b63ac0 100644 --- a/src/driver/pictureviewer/pictureviewer.cpp +++ b/src/driver/pictureviewer/pictureviewer.cpp @@ -16,6 +16,7 @@ #include #include #include +#include #ifdef FBV_SUPPORT_GIF extern int fh_gif_getsize (const char *, int *, int *, int, int); @@ -625,7 +626,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 = CNeutrinoApp::getInstance()->channelList->getChannel(ChannelID); + cc = CServiceManager::getInstance()->FindChannel(ChannelID); if (cc) { diff --git a/src/gui/streaminfo2.cpp b/src/gui/streaminfo2.cpp index dd65cd294..ee08724a3 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 = CNeutrinoApp::getInstance()->channelList->getChannel(channel->getChannelID()); + cc = CServiceManager::getInstance()->FindChannel(channel->getChannelID()); if (cc) {