From 3215a2e7563aa47605f2c3cd67253d0dc5dd795e Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Mon, 30 Oct 2017 02:09:39 +0100 Subject: [PATCH] Ref T177, added direct write flag because only direct writes require a consolidation --- src/blackcore/db/backgrounddataupdater.cpp | 3 ++- src/blackcore/db/backgrounddataupdater.h | 2 +- src/blackcore/db/databasewriter.cpp | 2 +- src/blackcore/db/databasewriter.h | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/blackcore/db/backgrounddataupdater.cpp b/src/blackcore/db/backgrounddataupdater.cpp index dfd1858ca..f2085c7dd 100644 --- a/src/blackcore/db/backgrounddataupdater.cpp +++ b/src/blackcore/db/backgrounddataupdater.cpp @@ -156,11 +156,12 @@ namespace BlackCore return true; } - void CBackgroundDataUpdater::onModelsPublished(const CAircraftModelList &modelsPublished) + void CBackgroundDataUpdater::onModelsPublished(const CAircraftModelList &modelsPublished, bool directWrite) { if (!this->doWorkCheck()) { return; } if (modelsPublished.isEmpty()) { return; } if (!m_updatePublishedModels) { return; } + if (!directWrite) { return; } // those models are CRs and have to be released first emit this->consolidating(true); this->syncModelOrModelSetCacheWithDbData(m_modelCaches, modelsPublished); diff --git a/src/blackcore/db/backgrounddataupdater.h b/src/blackcore/db/backgrounddataupdater.h index 96bcf12ea..cd2b3bb99 100644 --- a/src/blackcore/db/backgrounddataupdater.h +++ b/src/blackcore/db/backgrounddataupdater.h @@ -67,7 +67,7 @@ namespace BlackCore bool doWorkCheck() const; //! Models have been published - void onModelsPublished(const BlackMisc::Simulation::CAircraftModelList &modelsPublished); + void onModelsPublished(const BlackMisc::Simulation::CAircraftModelList &modelsPublished, bool directWrite); }; } // ns } // ns diff --git a/src/blackcore/db/databasewriter.cpp b/src/blackcore/db/databasewriter.cpp index 59ae5880a..de0ec4ffd 100644 --- a/src/blackcore/db/databasewriter.cpp +++ b/src/blackcore/db/databasewriter.cpp @@ -138,7 +138,7 @@ namespace BlackCore emit this->publishedModels(modelsPublished, modelsSkipped, msgs, sendingSuccessful, directWrite); if (!modelsPublished.isEmpty()) { - emit this->publishedModelsSimplified(modelsPublished); + emit this->publishedModelsSimplified(modelsPublished, directWrite); } Q_UNUSED(c); } diff --git a/src/blackcore/db/databasewriter.h b/src/blackcore/db/databasewriter.h index 691b754be..ebdcb45fe 100644 --- a/src/blackcore/db/databasewriter.h +++ b/src/blackcore/db/databasewriter.h @@ -63,7 +63,7 @@ namespace BlackCore bool sendingSuccessful, bool directWrite); //! Published models, simplified version of publishedModels - void publishedModelsSimplified(const BlackMisc::Simulation::CAircraftModelList &modelsPublished); + void publishedModelsSimplified(const BlackMisc::Simulation::CAircraftModelList &modelsPublished, bool directWrite); private: BlackMisc::Network::CUrlLogList m_writeLog;