From c4e42e82f0a30aa354e8f5ac5e97a5b6a0267568 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sun, 17 Jan 2016 16:42:19 +0100 Subject: [PATCH] sectionsd: revert "do not adjtime() if less than one second" This is actaully not that useful and add unnecessary complexity. --- src/eitd/sectionsd.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/eitd/sectionsd.cpp b/src/eitd/sectionsd.cpp index d521cf7ad..971e9b856 100644 --- a/src/eitd/sectionsd.cpp +++ b/src/eitd/sectionsd.cpp @@ -1388,7 +1388,6 @@ bool CTimeThread::setSystemTime(time_t tim, bool force) gettimeofday(&tv, NULL); timediff = int64_t(tim * 1000000 - (tv.tv_usec + tv.tv_sec * 1000000)); localtime_r(&tv.tv_sec, &t); - int absdiff = abs(tim - tv.tv_sec); xprintf("%s: timediff %" PRId64 ", current: %02d.%02d.%04d %02d:%02d:%02d, dvb: %s", name.c_str(), timediff, @@ -1400,9 +1399,7 @@ bool CTimeThread::setSystemTime(time_t tim, bool force) return; } #endif - if (absdiff < 1) /* do not bother for differences less than one second */ - return true; - if (absdiff < 120) { + if (timeset && abs(tim - tv.tv_sec) < 120) { /* abs() is int */ struct timeval oldd; tv.tv_sec = time_t(timediff / 1000000LL); tv.tv_usec = suseconds_t(timediff % 1000000LL);