third time try to fix reloadchannels segfault with alternate_logos

tuxbox-neutrino · Oct 19, 2021 · cf8c0ac · cf8c0ac
1 parent f31602f
commit cf8c0ac
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/src/gui/channellist.h b/src/gui/channellist.h
@@ -192,6 +192,7 @@ class CChannelList : public CListHelpers, public sigc::trackable
 
 	void SetChannelList(ZapitChannelList* zlist);
 	void addChannel(CZapitChannel* chan);
+	void ClearChannelList(){if (!(*chanlist).empty()) (*chanlist).clear();};
 
 	CZapitChannel* getChannel(int number);
 	CZapitChannel* getChannel(t_channel_id channel_id);

diff --git 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)
 		{

diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp
@@ -1503,7 +1503,7 @@ bool CZapit::ParseCommand(CBasicMessage::Header &rmsg, int connfd)
 	case CZapitMessages::CMD_REINIT_CHANNELS: {
 		// Houdini: save actual channel to restore it later, old version's channel was set to scans.conf initial channel
 		t_channel_id cid= current_channel ? current_channel->getChannelID() : 0;
-
+		CNeutrinoApp::getInstance()->channelList->ClearChannelList();
 		PrepareChannels();
 
 		current_channel = CServiceManager::getInstance()->FindChannel(cid);