From ebc8c7bb43f020b5dff3ed5b6d3f55155be7c56e Mon Sep 17 00:00:00 2001
From: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: Sun, 10 Mar 2013 00:27:13 +0100
Subject: [PATCH] neutrino: allow empty user bouquets in the bouquetlist

Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: https://github.com/neutrino-images/ni-neutrino/commit/0d2c3f3f10d1c12abf3060e0e49dde3cedada158
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-10 (Sun, 10 Mar 2013)
---
 src/neutrino.cpp | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index d09e0b5fb..274a8bc2e 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -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++;