Fix a lockup when resampling over a backwards DST switch
parent
acde9b2e5a
commit
c607ce7e4b
|
|
@ -682,6 +682,10 @@ QDateTime EnergyLogger::nextSampleTimestamp(SampleRate sampleRate, const QDateTi
|
||||||
case SampleRate3Hours:
|
case SampleRate3Hours:
|
||||||
time.setHMS(time.hour() - (time.hour() % 3), 0, 0);
|
time.setHMS(time.hour() - (time.hour() % 3), 0, 0);
|
||||||
next = QDateTime(date, time).addMSecs(3 * 60 * 60 * 1000);
|
next = QDateTime(date, time).addMSecs(3 * 60 * 60 * 1000);
|
||||||
|
if (next.time().hour() == 2) {
|
||||||
|
qCDebug(dcEnergyExperience()) << "DST switch detected!";
|
||||||
|
next = next.addMSecs(60 * 60 * 1000);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case SampleRate1Day:
|
case SampleRate1Day:
|
||||||
next = QDateTime(date, QTime()).addDays(1);
|
next = QDateTime(date, QTime()).addDays(1);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue