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

Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox

Browse Source 
Conflicts:
	configure.ac
	lib/Makefile.am
	src/zapit/src/femanager.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: cb9b4b1d7e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-13 (Sun, 13 Nov 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-11-13 01:34:20 +01:00
parent 3f897d218e 8f423715c2
commit 30bd7aa4cc
11 changed files with 41 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/timerd/timermanager.cpp
View File

@@ -292,9 +292,10 @@ int CTimerManager::unlockEvents()
bool CTimerManager::listEvents(CTimerEventMap &Events)
{
/* events is passed as reference and thus its address is never NULL
if(!&Events)
return false;
*/
Events.clear();
for (CTimerEventMap::iterator pos = events.begin(); pos != events.end(); ++pos)