From 801b584c8703aa1aad5a5d54d410480aebef1d90 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Tue, 30 Jan 2018 06:34:59 +0100 Subject: [PATCH] Ref T237, init DB caches from installer files --- src/blackcore/application.cpp | 9 ++++++++- src/blackcore/application.h | 8 ++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/blackcore/application.cpp b/src/blackcore/application.cpp index f3b5f2d17..9337b6486 100644 --- a/src/blackcore/application.cpp +++ b/src/blackcore/application.cpp @@ -866,12 +866,19 @@ namespace BlackCore new CWebDataServices(m_webReadersUsed, m_dbReaderConfig, {}, this) ); + // caches from local files (i.e. the files delivered) + if (this->isInstallerOptionSet()) + { + msgs.push_back(m_webDataServices->initDbCachesFromLocalResourceFiles(false)); + } + + // watchdog if (m_networkWatchDog) { connect(m_webDataServices.data(), &CWebDataServices::swiftDbDataRead, m_networkWatchDog.data(), &CNetworkWatchdog::setDbAccessibility); } - emit webDataServicesStarted(true); + emit this->webDataServicesStarted(true); } else { diff --git a/src/blackcore/application.h b/src/blackcore/application.h index 22801e24d..77e802eb4 100644 --- a/src/blackcore/application.h +++ b/src/blackcore/application.h @@ -612,11 +612,11 @@ namespace BlackCore CWebReaderFlags::WebReader m_webReadersUsed; //!< Readers to be used Db::CDatabaseReaderConfigList m_dbReaderConfig; //!< Load or used caching? std::atomic m_shutdown { false }; //!< is being shutdown? - bool m_useContexts = false; //!< use contexts - bool m_useWebData = false; //!< use web data - bool m_signalStartup = true; //!< signal startup automatically + bool m_useContexts = false; //!< use contexts + bool m_useWebData = false; //!< use web data + bool m_signalStartup = true; //!< signal startup automatically bool m_devFlag = false; //!< dev. environment - bool m_saveSettingsOnShutdown = true; //!< saving all settings on shutdown + bool m_saveSettingsOnShutdown = true; //!< saving all settings on shutdown // -------------- crashpad ----------------- BlackMisc::CStatusMessageList initCrashHandler();