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

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

Browse Source 
Conflicts:
	configure.ac
	lib/sectionsdclient/Makefile.am
	lib/timerdclient/Makefile.am


Origin commit data
------------------
Commit: 93fdd4aa79
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)
This commit is contained in:
vanhofen
2016-11-17 09:52:47 +01:00
parent d35c5a76c9 ff4fb2d640
commit 83e62e9d50
20 changed files with 261 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/driver/record.cpp
View File

@@ -1819,10 +1819,14 @@ CRecordInstance* CRecordManager::getUseCI()
mutex.lock();
for(recmap_iterator_t it = recmap.begin(); it != recmap.end(); it++) {
CRecordInstance * inst = it->second;
CZapitChannel * channel = CServiceManager::getInstance()->FindChannel(inst->GetChannelId());
if (channel->bUseCI) {
mutex.unlock();
return inst;
if (inst)
{
CZapitChannel * channel = CServiceManager::getInstance()->FindChannel(inst->GetChannelId());
if (channel && channel->bUseCI)
{
mutex.unlock();
return inst;
}
}
}
mutex.unlock();