mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 16:01:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1ddcc0c7ce
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-02 (Wed, 02 Nov 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-11-02 09:50:10 +01:00
parent abfb65680e c21cc27381
commit 6dfe9dc9ba
50 changed files with 5794 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/channellist.cpp
View File

@@ -2295,10 +2295,12 @@ bool CChannelList::SameTP(CZapitChannel * channel)
if (IS_WEBTV(channel->getChannelID()))
return true;
//NI
if(g_settings.ci_mode == 1) {
if(channel->bUseCI && CRecordManager::getInstance()->getUseCI())
return (CRecordManager::getInstance()->SameTransponder(channel->getChannelID()));
//NI - Usable CI channel while recording
if(g_settings.ci_mode != 0 && channel->bUseCI && CRecordManager::getInstance()->getUseCI()) {
if(g_settings.ci_mode == 1)
return (CRecordManager::getInstance()->SameTransponder(channel->getChannelID())); // SameTransponder
else
return false; // No other CI channel
}
iscurrent = CFEManager::getInstance()->canTune(channel);