Version 1.0.21.beta

Fixed issues where the wrong UTC time might be sent in some cases.

CHANGELOG.txt

@@ -1,6 +1,10 @@
 Numbers (#) refer to GitHub issues in project `littlenavmap`.
 For example: #3 is `https://github.com/albar965/littlenavmap/issues/3`.
 
+Version 1.0.21.beta
+
+* Fixed issues where the wrong UTC time might be sent in some cases.
+
 Version 1.0.20.beta
 
 Notes:

src/main.cpp

@@ -92,7 +92,7 @@ PLUGIN_API int XPluginStart(char *outName, char *outSig, char *outDesc)
   app->setOrganizationName("ABarthel");
   app->setOrganizationDomain("littlenavmap.org");
 
-  app->setApplicationVersion("1.0.20.beta"); // VERSION_NUMBER - Little Xpconnect
+  app->setApplicationVersion("1.0.21.beta"); // VERSION_NUMBER - Little Xpconnect
 
   // Initialize logging and force logfiles into the system or user temp directory
   LoggingHandler::initializeForTemp(Settings::getOverloadedPath(":/littlexpconnect/resources/config/logging.cfg"));

src/xpconnect.cpp

@@ -250,19 +250,10 @@ bool XpConnect::fillSimConnectData(atools::fs::sc::SimConnectData& data, bool fe
 
   // Build local time and use timezone offset from simulator
   // X-Plane does not allow to set the year
-  QDate localDate = QDate::currentDate();
-  localDate.setDate(localDate.year(), 1, 1);
-  localDate = localDate.addDays(dr::localDateDays.valueInt());
-  int localTimeSec = static_cast<int>(dr::localTimeSec.valueFloat());
-  int zuluTimeSec = static_cast<int>(dr::zuluTimeSec.valueFloat());
-  int offsetSeconds = zuluTimeSec - localTimeSec;
-
-  QTime localTime = QTime::fromMSecsSinceStartOfDay(localTimeSec * 1000);
-  QDateTime localDateTime(localDate, localTime, Qt::OffsetFromUTC, -offsetSeconds);
-  userAircraft.localDateTime = localDateTime;
-
-  QTime zuluTime = QTime::fromMSecsSinceStartOfDay(zuluTimeSec * 1000);
-  userAircraft.zuluDateTime = QDateTime(localDate, zuluTime, Qt::UTC);
+  userAircraft.localDateTime = atools::correctDateLocal(dr::localDateDays.valueInt(),
+                                                      atools::roundToInt(dr::localTimeSec.valueFloat()),
+                                                      atools::roundToInt(dr::zuluTimeSec.valueFloat()));
+  userAircraft.zuluDateTime = userAircraft.localDateTime.toUTC();
 
   // SimConnectAircraft
   userAircraft.airplaneTitle = dr::airplaneTitle.valueString();