Ticket #9676: eithelper.patch

mythtv/libs/libmyth/util.cpp

@@ -84 +84 @@
     return QDateTime::fromString(dtstr, Qt::ISODate);
 }
 
+// Note: this function calculates the offset from UTC "right now". That offset
+// may not be valid a moment later, since daylight savings time might start or
+// end during that moment. Thus it's not valid to use this in calculations of
+// future events, like program guide data
 int calc_utc_offset(void)
 {
+
     QDateTime loc = QDateTime::currentDateTime();
-    QDateTime utc = QDateTime::currentDateTime().toUTC();
+    QDateTime utc = loc; // make an exact copy so elapsed time doesn't factor in
+    utc.setTimeSpec(Qt::UTC); // keeping same clock time, change only the time zone
 
-    int utc_offset = MythSecsTo(utc, loc);
+    int utc_offset = MythSecsTo(loc, utc);
 
     // clamp to nearest minute if within 10 seconds
     int off = utc_offset % 60;
@@ -529 +535 @@
  */
 int MythSecsTo(const QDateTime &from, const QDateTime &to)
 {
-   return (from.time().secsTo(to.time()) +
-           from.date().daysTo(to.date()) * 60 * 60 * 24);
+   return (from.secsTo(to));
 }
 
 /** \fn MythUTCToLocal(const QDateTime&)
@@ -538 +543 @@
  */
 QDateTime MythUTCToLocal(const QDateTime &utc)
 {
-    QDateTime local = QDateTime(QDate(1970, 1, 1));
+    QDateTime local = QDateTime(QDate(1970, 1, 1),QTime(0,0,0),Qt::UTC);
 
     int timesecs = MythSecsTo(local, utc);
     QDateTime localdt;

mythtv/libs/libmythtv/eithelper.cpp

@@ -620 +620 @@
         return;
 
     QDateTime starttime;
-    time_t off = secs_Between_1Jan1970_6Jan1980 + gps_offset + utc_offset;
+    time_t off = secs_Between_1Jan1970_6Jan1980 + gps_offset;
     time_t tmp = event.start_time + off;
     tm result;
 
@@ -630 +630 @@
                                 result.tm_mon + 1,
                                 result.tm_mday));
         starttime.setTime(QTime(result.tm_hour, result.tm_min, result.tm_sec));
+        starttime.setTimeSpec(Qt::UTC);
     }
     else
     {
-        starttime.setTime_t(tmp - utc_offset);
+        starttime.setTime_t(tmp);
     }
+    starttime = MythUTCToLocal(starttime);
 
     // fix starttime only if the duration is a multiple of a minute
     if (!(event.length % 60))