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

gui/channellist.cpp: bug fix, default copy constructor is danger, if class have pointers

Browse Source
This commit is contained in:
[CST] Focus
2014-11-26 10:45:29 +03:00
parent e964a13763
commit 36b14e31ef
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/channellist.cpp
View File

@@ -119,7 +119,6 @@ CChannelList::CChannelList(const char * const pName, bool phistoryMode, bool _vl
CChannelList::~CChannelList() CChannelList::~CChannelList()
{ {
chanlist->clear();
if(dline){ if(dline){
delete dline; delete dline;
dline = NULL; dline = NULL;

1
src/gui/channellist.h
View File

@@ -236,6 +236,7 @@ public:
SORT_MAX SORT_MAX
}; };
unsigned Size() { return (*chanlist).size(); } unsigned Size() { return (*chanlist).size(); }
ZapitChannelList &getChannels() { return channels; };
}; };
#endif #endif

6
src/neutrino.cpp
View File

@@ -1363,13 +1363,11 @@ void CNeutrinoApp::channelsInit(bool bOnly)
TVallList = new CBouquetList(g_Locale->getText(LOCALE_CHANNELLIST_HEAD)); TVallList = new CBouquetList(g_Locale->getText(LOCALE_CHANNELLIST_HEAD));
tmp = TVallList->addBouquet(g_Locale->getText(LOCALE_CHANNELLIST_HEAD)); tmp = TVallList->addBouquet(g_Locale->getText(LOCALE_CHANNELLIST_HEAD));
delete tmp->channelList; tmp->channelList->SetChannelList(&TVchannelList->getChannels());
tmp->channelList = new CChannelList(*TVchannelList);
RADIOallList = new CBouquetList(g_Locale->getText(LOCALE_CHANNELLIST_HEAD)); RADIOallList = new CBouquetList(g_Locale->getText(LOCALE_CHANNELLIST_HEAD));
tmp = RADIOallList->addBouquet(g_Locale->getText(LOCALE_CHANNELLIST_HEAD)); tmp = RADIOallList->addBouquet(g_Locale->getText(LOCALE_CHANNELLIST_HEAD));
delete tmp->channelList; tmp->channelList->SetChannelList(&RADIOchannelList->getChannels());
tmp->channelList = new CChannelList(*RADIOchannelList);
if(TVsatList) delete TVsatList; if(TVsatList) delete TVsatList;
TVsatList = new CBouquetList(g_Locale->getText(LOCALE_CHANNELLIST_SATS)); TVsatList = new CBouquetList(g_Locale->getText(LOCALE_CHANNELLIST_SATS));