diff options
| author | Beat Forster <bfo@synthesis.ch> | 2009-05-05 20:25:54 +0200 |
|---|---|---|
| committer | Lukas Zeller <luz@synthesis.ch> | 2009-05-05 20:25:54 +0200 |
| commit | 26c31e114ed9b8405ba7b3e560024d8cc02e6ab0 (patch) | |
| tree | b3ccf2baefd3042cd95da3c2d840b83c70431614 | |
| parent | 725c429d5a4805e95cea34840450e302565eacdb (diff) | |
timezones: zones without DST rules (e.g. China) will be recognized correctlylibsynthesis_3.2.0.27
| -rw-r--r-- | src/sysync/vtimezone.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/sysync/vtimezone.cpp b/src/sysync/vtimezone.cpp index 1c4317c..d10e0b2 100644 --- a/src/sysync/vtimezone.cpp +++ b/src/sysync/vtimezone.cpp @@ -530,7 +530,8 @@ bool internalToVTIMEZONE( timecontext_t aContext, cAppCharP id; bool withDST= false; - if (GetTZ( aContext, t, g, yy )) { + bool tzEnum= GetTZ( aContext, t, g, yy ); + if (tzEnum) { withDST= t.std.wMonth!=0 && t.dst.wMonth!=0; if (t.ident == "$") { aText= t.name; return true; } // just give it back @@ -561,7 +562,7 @@ bool internalToVTIMEZONE( timecontext_t aContext, // make sure we get the right TZID string according to aPrefIdent string tzn = t.name; - if (aPrefIdent) { + if (aPrefIdent && tzEnum) { TimeZoneContextToName(aContext, tzn, g, aPrefIdent); } |