- Fix daylight saving time bug in timers (backport from tuxbox-cvs)

This commit is contained in:
striper
2012-10-13 17:10:25 +02:00
committed by satbaby
parent dc95ffa37c
commit 636f7cef05
3 changed files with 1 additions and 3 deletions

View File

@@ -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)

View File

@@ -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();

View File

@@ -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