mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "second try to fix reloadchannels segfault with alternate_logos"

Browse Source 
This reverts commit f58fc736fe.
This commit is contained in:
Jacek Jendrzej
2021-10-17 17:06:49 +02:00
parent 56bd12bac1
commit 173664f80a
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,7 +16,6 @@
#include <errno.h> #include <errno.h>
#include <cs_api.h> #include <cs_api.h>
#include <sys/sysinfo.h> #include <sys/sysinfo.h>
#include <zapit/zapit.h>
#ifdef FBV_SUPPORT_GIF #ifdef FBV_SUPPORT_GIF
extern int fh_gif_getsize (const char *, int *, int *, int, int); 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; CZapitChannel * cc = NULL;
if (name.compare("alternate_logos") != 0 && ChannelID && CNeutrinoApp::getInstance()->channelList) if (name.compare("alternate_logos") != 0 && ChannelID && CNeutrinoApp::getInstance()->channelList)
cc = CServiceManager::getInstance()->FindChannel(ChannelID); cc = CNeutrinoApp::getInstance()->channelList->getChannel(ChannelID);
if (cc) if (cc)
{ {

2
src/gui/streaminfo2.cpp
View File

@@ -1127,7 +1127,7 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
CZapitChannel * cc = NULL; CZapitChannel * cc = NULL;
if (channel->getChannelID() & 0xFFFFFFFFFFFFULL) if (channel->getChannelID() & 0xFFFFFFFFFFFFULL)
if (CNeutrinoApp::getInstance()->channelList) if (CNeutrinoApp::getInstance()->channelList)
cc = CServiceManager::getInstance()->FindChannel(channel->getChannelID()); cc = CNeutrinoApp::getInstance()->channelList->getChannel(channel->getChannelID());
if (cc) if (cc)
{ {