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

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

Browse Source 
Conflicts:
	data/locale/english.locale
	data/pictures/backgrounds/1280x720/shutdown.jpg
	src/Makefile.am
	src/zapit/src/frontend.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 40e46a0df3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-03-15 23:45:02 +01:00
parent 45f0ad7d7e 8073cfc4d6
commit 26e23762ca
10 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/eitd/sectionsd.cpp
View File

@@ -1418,11 +1418,12 @@ bool CTimeThread::setSystemTime(time_t tim, bool force)
tv.tv_sec = tim;
tv.tv_usec = 0;
errno=0;
if (settimeofday(&tv, NULL) == 0)
return true;
perror("[sectionsd] settimeofday");
return false;
return errno==EPERM;
}
void CTimeThread::addFilters()