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

neutrino: allow empty user bouquets in the bouquetlist

Browse Source 
Conflicts:
	src/neutrino.cpp
This commit is contained in:
Stefan Seyfried
2013-03-10 00:27:13 +01:00
committed by [CST] Focus
parent b8cd692257
commit 0d2c3f3f10
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/neutrino.cpp
View File

@@ -1330,21 +1330,22 @@ void CNeutrinoApp::channelsInit(bool bOnly)
/* Favorites and providers bouquets */ /* Favorites and providers bouquets */
tvi = ri = 0; tvi = ri = 0;
for (i = 0; i < g_bouquetManager->Bouquets.size(); i++) { for (i = 0; i < g_bouquetManager->Bouquets.size(); i++) {
if (!g_bouquetManager->Bouquets[i]->bHidden) { CZapitBouquet *b = g_bouquetManager->Bouquets[i];
if (g_bouquetManager->Bouquets[i]->getTvChannels(zapitList)) { if (!b->bHidden) {
if(g_bouquetManager->Bouquets[i]->bUser) if (b->getTvChannels(zapitList) || b->bUser) {
tmp = TVfavList->addBouquet(g_bouquetManager->Bouquets[i]); if(b->bUser)
tmp = TVfavList->addBouquet(b);
else else
tmp = TVbouquetList->addBouquet(g_bouquetManager->Bouquets[i]); tmp = TVbouquetList->addBouquet(b);
tmp->channelList->SetChannelList(&zapitList); tmp->channelList->SetChannelList(&zapitList);
tvi++; tvi++;
} }
if (g_bouquetManager->Bouquets[i]->getRadioChannels(zapitList)) { if (b->getRadioChannels(zapitList) || b->bUser) {
if(g_bouquetManager->Bouquets[i]->bUser) if(b->bUser)
tmp = RADIOfavList->addBouquet(g_bouquetManager->Bouquets[i]); tmp = RADIOfavList->addBouquet(b);
else else
tmp = RADIObouquetList->addBouquet(g_bouquetManager->Bouquets[i]); tmp = RADIObouquetList->addBouquet(b);
tmp->channelList->SetChannelList(&zapitList); tmp->channelList->SetChannelList(&zapitList);
ri++; ri++;