diff --git a/src/gui/widget/stringinput_ext.cpp b/src/gui/widget/stringinput_ext.cpp index 2f80729bc..44f29523f 100644 --- a/src/gui/widget/stringinput_ext.cpp +++ b/src/gui/widget/stringinput_ext.cpp @@ -516,7 +516,6 @@ void CDateInput::onBeforeExec() sprintf( value, "%02d.%02d.%04d %02d:%02d", tmTime->tm_mday, tmTime->tm_mon+1, tmTime->tm_year+1900, tmTime->tm_hour, tmTime->tm_min); - dst = tmTime->tm_isdst; } void CDateInput::onAfterExec() @@ -529,7 +528,6 @@ void CDateInput::onAfterExec() tmTime.tm_year -= 1900; tmTime.tm_sec = 0; - //tmTime.tm_isdst = dst; tmTime.tm_isdst = -1; if(tmTime.tm_year>129) diff --git a/src/gui/widget/stringinput_ext.h b/src/gui/widget/stringinput_ext.h index 42b632391..22ed53bb5 100644 --- a/src/gui/widget/stringinput_ext.h +++ b/src/gui/widget/stringinput_ext.h @@ -167,7 +167,6 @@ class CDateInput : public CExtendedInput { private: time_t* time; - int dst; protected: virtual void onBeforeExec(); diff --git a/src/nhttpd/yhttpd_core/helper.cpp b/src/nhttpd/yhttpd_core/helper.cpp index 68d7b55e3..38b188ba2 100644 --- a/src/nhttpd/yhttpd_core/helper.cpp +++ b/src/nhttpd/yhttpd_core/helper.cpp @@ -44,6 +44,7 @@ void correctTime(struct tm *zt) { zt->tm_hour = minmax(zt->tm_hour, 0, 23); zt->tm_min = minmax(zt->tm_min, 0, 59); zt->tm_sec = minmax(zt->tm_sec, 0, 59); + zt->tm_isdst = -1; } //============================================================================= // Strings