mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-01 01:41:12 +02:00
Fix daylight saving time bug in timers (backport from tuxbox-cvs)
Origin commit data
------------------
Commit: 636f7cef05
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2012-10-13 (Sat, 13 Oct 2012)
Origin message was:
------------------
- Fix daylight saving time bug in timers (backport from tuxbox-cvs)
This commit is contained in:
@@ -516,7 +516,6 @@ void CDateInput::onBeforeExec()
|
|||||||
sprintf( value, "%02d.%02d.%04d %02d:%02d", tmTime->tm_mday, tmTime->tm_mon+1,
|
sprintf( value, "%02d.%02d.%04d %02d:%02d", tmTime->tm_mday, tmTime->tm_mon+1,
|
||||||
tmTime->tm_year+1900,
|
tmTime->tm_year+1900,
|
||||||
tmTime->tm_hour, tmTime->tm_min);
|
tmTime->tm_hour, tmTime->tm_min);
|
||||||
dst = tmTime->tm_isdst;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void CDateInput::onAfterExec()
|
void CDateInput::onAfterExec()
|
||||||
@@ -529,7 +528,6 @@ void CDateInput::onAfterExec()
|
|||||||
tmTime.tm_year -= 1900;
|
tmTime.tm_year -= 1900;
|
||||||
tmTime.tm_sec = 0;
|
tmTime.tm_sec = 0;
|
||||||
|
|
||||||
//tmTime.tm_isdst = dst;
|
|
||||||
tmTime.tm_isdst = -1;
|
tmTime.tm_isdst = -1;
|
||||||
|
|
||||||
if(tmTime.tm_year>129)
|
if(tmTime.tm_year>129)
|
||||||
|
@@ -167,7 +167,6 @@ class CDateInput : public CExtendedInput
|
|||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
time_t* time;
|
time_t* time;
|
||||||
int dst;
|
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual void onBeforeExec();
|
virtual void onBeforeExec();
|
||||||
|
@@ -44,6 +44,7 @@ void correctTime(struct tm *zt) {
|
|||||||
zt->tm_hour = minmax(zt->tm_hour, 0, 23);
|
zt->tm_hour = minmax(zt->tm_hour, 0, 23);
|
||||||
zt->tm_min = minmax(zt->tm_min, 0, 59);
|
zt->tm_min = minmax(zt->tm_min, 0, 59);
|
||||||
zt->tm_sec = minmax(zt->tm_sec, 0, 59);
|
zt->tm_sec = minmax(zt->tm_sec, 0, 59);
|
||||||
|
zt->tm_isdst = -1;
|
||||||
}
|
}
|
||||||
//=============================================================================
|
//=============================================================================
|
||||||
// Strings
|
// Strings
|
||||||
|
Reference in New Issue
Block a user