flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-27 19:25:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T109, make sure CWebDataServices::initXXAndTriggerRead is in correct thread

Browse Source
This commit is contained in:
Klaus Basan
2017-07-16 03:53:25 +02:00
committed by Mathew Sutcliffe
parent e2853c3db2
commit 808fd48650
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/blackcore/webdataservices.cpp
View File

@@ -58,7 +58,7 @@ namespace BlackCore
Q_ASSERT_X(QSslSocket::supportsSsl(), Q_FUNC_INFO, "Missing SSL support"); Q_ASSERT_X(QSslSocket::supportsSsl(), Q_FUNC_INFO, "Missing SSL support");
Q_ASSERT_X(sApp->isSetupAvailable(), Q_FUNC_INFO, "Setup not synchronized"); Q_ASSERT_X(sApp->isSetupAvailable(), Q_FUNC_INFO, "Setup not synchronized");
this->setObjectName("CWebDataReader"); this->setObjectName("CWebDataServices");
// check if I need info objects // check if I need info objects
const bool readFromSwiftDb = dbReaderConfig.possiblyReadsFromSwiftDb(); // DB read access const bool readFromSwiftDb = dbReaderConfig.possiblyReadsFromSwiftDb(); // DB read access
@@ -899,6 +899,13 @@ namespace BlackCore
void CWebDataServices::initDbInfoObjectReaderAndTriggerRead() void CWebDataServices::initDbInfoObjectReaderAndTriggerRead()
{ {
// run in correct thread
if (!CThreadUtils::isCurrentThreadObjectThread(this))
{
QTimer::singleShot(0, this, &CWebDataServices::initDbInfoObjectReaderAndTriggerRead);
return;
}
if (!this->m_dbInfoDataReader) if (!this->m_dbInfoDataReader)
{ {
this->m_dbInfoDataReader = new CInfoDataReader(this, m_dbReaderConfig, CDbFlags::DbReading); this->m_dbInfoDataReader = new CInfoDataReader(this, m_dbReaderConfig, CDbFlags::DbReading);
@@ -915,11 +922,18 @@ namespace BlackCore
} }
// and trigger read // and trigger read
QTimer::singleShot(0, [this]() { this->m_dbInfoDataReader->read(); }); QTimer::singleShot(0, m_dbInfoDataReader, [this]() { this->m_dbInfoDataReader->read(); });
} }
void CWebDataServices::initSharedInfoObjectReaderAndTriggerRead() void CWebDataServices::initSharedInfoObjectReaderAndTriggerRead()
{ {
// run in correct thread
if (!CThreadUtils::isCurrentThreadObjectThread(this))
{
QTimer::singleShot(0, this, &CWebDataServices::initSharedInfoObjectReaderAndTriggerRead);
return;
}
if (!this->m_sharedInfoDataReader) if (!this->m_sharedInfoDataReader)
{ {
this->m_sharedInfoDataReader = new CInfoDataReader(this, m_dbReaderConfig, CDbFlags::Shared); this->m_sharedInfoDataReader = new CInfoDataReader(this, m_dbReaderConfig, CDbFlags::Shared);
@@ -936,7 +950,7 @@ namespace BlackCore
} }
// and trigger read // and trigger read
QTimer::singleShot(0, [this]() { this->m_sharedInfoDataReader->read(); }); QTimer::singleShot(0, m_sharedInfoDataReader, [this]() { this->m_sharedInfoDataReader->read(); });
} }
CDatabaseReader *CWebDataServices::getDbReader(CEntityFlags::Entity entity) const CDatabaseReader *CWebDataServices::getDbReader(CEntityFlags::Entity entity) const