From 431ee75f435e8e1b738c39002d72eb8dfc9fc714 Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Fri, 13 Jan 2012 14:58:22 +0400 Subject: [PATCH] zapit bouquets: force creating Other bouquet for unused channels Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/bcae2e2b89aabe69648cbcbb8b6dc927a9e74455 Author: [CST] Focus Date: 2012-01-13 (Fri, 13 Jan 2012) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/zapit/src/bouquets.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/zapit/src/bouquets.cpp b/src/zapit/src/bouquets.cpp index 26e804f9b..1e14f47d5 100644 --- a/src/zapit/src/bouquets.cpp +++ b/src/zapit/src/bouquets.cpp @@ -410,7 +410,8 @@ void CBouquetManager::renumChannels(ZapitChannelList &list, int & counter, char void CBouquetManager::makeRemainingChannelsBouquet(void) { ZapitChannelList unusedChannels; - bool tomake = CZapit::getInstance()->makeRemainingChannelsBouquet(); + //FIXME services loaded before config. + //bool tomake = CZapit::getInstance()->makeRemainingChannelsBouquet(); /* reset channel number and has_bouquet flag */ CServiceManager::getInstance()->ResetChannelNumbers(); @@ -421,7 +422,7 @@ void CBouquetManager::makeRemainingChannelsBouquet(void) renumChannels((*it)->radioChannels, j, (*it)->bUser ? NULL : (char *) (*it)->Name.c_str()); } - if(!tomake || CServiceManager::getInstance()->GetAllUnusedChannels(unusedChannels) == false) + if(/*!tomake ||*/ CServiceManager::getInstance()->GetAllUnusedChannels(unusedChannels) == false) return; sort(unusedChannels.begin(), unusedChannels.end(), CmpChannelByChName());