flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-01 05:26:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #476 CThreadedReader::gracefulShutdown using the worker abandon feature, removed m_shutdown.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2015-11-25 20:35:48 +00:00
parent 1dc4864ffa
commit 3e1eb350c5
7 changed files with 11 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackcore/databasereader.cpp
View File

@@ -26,7 +26,7 @@ namespace BlackCore
void CDatabaseReader::readInBackgroundThread(CEntityFlags::Entity entities)
{
if (isFinishedOrShutdown()) { return; }
if (isAbandoned()) { return; }
this->m_watchdogTimer.stop();
bool s = QMetaObject::invokeMethod(this, "ps_read", Q_ARG(BlackMisc::Network::CEntityFlags::Entity, entities));
Q_ASSERT_X(s, Q_FUNC_INFO, "Invoke failed");
@@ -37,7 +37,7 @@ namespace BlackCore
{
this->threadAssertCheck();
JsonDatastoreResponse datastoreResponse;
if (this->isFinishedOrShutdown())
if (this->isAbandoned())
{
CLogMessage(this).info("Terminated data parsing process"); // for users
nwReply->abort();