Run tzset() and localtime() in getTZOffset() to ensure proper timezon…

…e offset
meshtastic · May 31, 2024 · 7e81375 · 7e81375
1 parent 10e3040
commit 7e81375
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/gps/RTC.cpp b/src/gps/RTC.cpp
@@ -222,12 +222,14 @@ bool perhapsSetRTC(RTCQuality q, struct tm &t)
  */
 int32_t getTZOffset()
 {
+    tzset();
     time_t now;
     struct tm *gmt;
+    struct tm *local;
     now = time(NULL);
     gmt = gmtime(&now);
-    gmt->tm_isdst = -1;
-    return (int32_t)difftime(now, mktime(gmt));
+    local = localtime(&now);
+    return (int32_t)difftime(mktime(local), mktime(gmt));
 }
 
 /**
@@ -265,4 +267,4 @@ time_t gm_mktime(struct tm *tm)
         setenv("TZ", "UTC0", 1);
     }
     return res;
-}
+}