Merge branch 'jb48628' into 'master'

[kcalcore] Return tz parameter in case of offset mismatch. Contributes to JB#48628 See merge request mer-core/kcalcore!14
sailfishos · Jan 22, 2020 · ed7a28b · ed7a28b
2 parents 3ef35e5 + 5cd355d
commit ed7a28b
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/kcalcore/icaltimezones.cpp b/kcalcore/icaltimezones.cpp
@@ -1044,6 +1044,10 @@ ICalTimeZone ICalTimeZoneSource::parse( MSTimeZone *tz, ICalTimeZones &zones )
   }
   const ICalTimeZone oldzone = zones.zone( zone );
   if ( oldzone.isValid() ) {
+    const QDateTime currDateTime = QDateTime::currentDateTimeUtc();
+    if ( zone.offsetAtUtc(currDateTime) != oldzone.offsetAtUtc(currDateTime) ) {
+      return zone; // use the new zone, as its offset data is what the client wants.
+    }
     // A similar zone already exists in the collection, so don't add this
     // new zone, return old zone instead.
     return oldzone;