mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-29 16:31:05 +02:00
neutrino: allow empty user bouquets in the bouquetlist
Conflicts:
src/neutrino.cpp
Origin commit data
------------------
Commit: 0d2c3f3f10
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-10 (Sun, 10 Mar 2013)
This commit is contained in:
committed by
[CST] Focus
parent
68b8a8dcb6
commit
ebc8c7bb43
@@ -1330,21 +1330,22 @@ void CNeutrinoApp::channelsInit(bool bOnly)
|
||||
/* Favorites and providers bouquets */
|
||||
tvi = ri = 0;
|
||||
for (i = 0; i < g_bouquetManager->Bouquets.size(); i++) {
|
||||
if (!g_bouquetManager->Bouquets[i]->bHidden) {
|
||||
if (g_bouquetManager->Bouquets[i]->getTvChannels(zapitList)) {
|
||||
if(g_bouquetManager->Bouquets[i]->bUser)
|
||||
tmp = TVfavList->addBouquet(g_bouquetManager->Bouquets[i]);
|
||||
CZapitBouquet *b = g_bouquetManager->Bouquets[i];
|
||||
if (!b->bHidden) {
|
||||
if (b->getTvChannels(zapitList) || b->bUser) {
|
||||
if(b->bUser)
|
||||
tmp = TVfavList->addBouquet(b);
|
||||
else
|
||||
tmp = TVbouquetList->addBouquet(g_bouquetManager->Bouquets[i]);
|
||||
tmp = TVbouquetList->addBouquet(b);
|
||||
|
||||
tmp->channelList->SetChannelList(&zapitList);
|
||||
tvi++;
|
||||
}
|
||||
if (g_bouquetManager->Bouquets[i]->getRadioChannels(zapitList)) {
|
||||
if(g_bouquetManager->Bouquets[i]->bUser)
|
||||
tmp = RADIOfavList->addBouquet(g_bouquetManager->Bouquets[i]);
|
||||
if (b->getRadioChannels(zapitList) || b->bUser) {
|
||||
if(b->bUser)
|
||||
tmp = RADIOfavList->addBouquet(b);
|
||||
else
|
||||
tmp = RADIObouquetList->addBouquet(g_bouquetManager->Bouquets[i]);
|
||||
tmp = RADIObouquetList->addBouquet(b);
|
||||
|
||||
tmp->channelList->SetChannelList(&zapitList);
|
||||
ri++;
|
||||
|
Reference in New Issue
Block a user