From c8a914eb7a4b749a7f4b6ab4ad3fb46ef435ba4c Mon Sep 17 00:00:00 2001 From: Roland Winklmeier Date: Sun, 4 Oct 2015 17:54:33 +0200 Subject: [PATCH] Fix initial reading of Vatsim metars --- src/blackcore/vatsimmetarreader.cpp | 2 +- src/blackcore/webdataservices.cpp | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/blackcore/vatsimmetarreader.cpp b/src/blackcore/vatsimmetarreader.cpp index 14b5e0e63..ab4cf4a63 100644 --- a/src/blackcore/vatsimmetarreader.cpp +++ b/src/blackcore/vatsimmetarreader.cpp @@ -33,7 +33,7 @@ namespace BlackCore void CVatsimMetarReader::readInBackgroundThread() { - bool s = QMetaObject::invokeMethod(this, "ps_readMetar"); + bool s = QMetaObject::invokeMethod(this, "ps_readMetars"); Q_ASSERT_X(s, Q_FUNC_INFO, "Cannot invoke"); Q_UNUSED(s); } diff --git a/src/blackcore/webdataservices.cpp b/src/blackcore/webdataservices.cpp index 5ea46db20..5b1f2cd24 100644 --- a/src/blackcore/webdataservices.cpp +++ b/src/blackcore/webdataservices.cpp @@ -166,6 +166,15 @@ namespace BlackCore } } + if (m_vatsimMetarReader) + { + if (whatToRead.testFlag(CEntityFlags::MetarEntity)) + { + m_vatsimMetarReader->readInBackgroundThread(); + triggeredRead |= CEntityFlags::MetarEntity; + } + } + if (m_icaoDataReader) { if (whatToRead.testFlag(CEntityFlags::AircraftIcaoEntity) || whatToRead.testFlag(CEntityFlags::AirlineIcaoEntity) || whatToRead.testFlag(CEntityFlags::CountryEntity)) @@ -471,8 +480,9 @@ namespace BlackCore else { // only readers requested will be read - if (this->m_vatsimBookingReader) {this->m_vatsimBookingReader->readInBackgroundThread(); } - if (this->m_vatsimDataFileReader) this->m_vatsimDataFileReader->readInBackgroundThread(); + if (this->m_vatsimBookingReader) { this->m_vatsimBookingReader->readInBackgroundThread(); } + if (this->m_vatsimDataFileReader) { this->m_vatsimDataFileReader->readInBackgroundThread(); } + if (this->m_vatsimMetarReader) { this->m_vatsimMetarReader->readInBackgroundThread(); } if (this->m_icaoDataReader) { this->m_icaoDataReader->readInBackgroundThread(CEntityFlags::AllIcaoAndCountries); } if (this->m_modelDataReader) { this->m_modelDataReader->readInBackgroundThread(CEntityFlags::DistributorLiveryModel); } }