From a1e16ea162e167792fe1156880a2e3192e25cfa3 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Mon, 3 Jul 2017 19:57:10 +0200
Subject: [PATCH] Background updater can be const, only needed "readonly" for
 UI

---
 src/blackcore/db/backgrounddataupdater.cpp         | 1 +
 src/blackgui/components/datasettingscomponent.cpp  | 2 +-
 src/blackgui/components/datasettingscomponent.h    | 2 +-
 src/blackgui/components/settingsmodelcomponent.cpp | 2 +-
 src/blackgui/components/settingsmodelcomponent.h   | 4 ++--
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/blackcore/db/backgrounddataupdater.cpp b/src/blackcore/db/backgrounddataupdater.cpp
index 3adf61dd9..e4ca6d1e6 100644
--- a/src/blackcore/db/backgrounddataupdater.cpp
+++ b/src/blackcore/db/backgrounddataupdater.cpp
@@ -169,6 +169,7 @@ namespace BlackCore
             const QSet<CSimulatorInfo> simSet = sims.asSingleSimulatorSet();
             for (const CSimulatorInfo &singleInfo : simSet)
             {
+                if (this->isShuttingDown()) { return; }
                 CAircraftModelList simModels = cache.getSynchronizedCachedModels(singleInfo);
                 if (simModels.isEmpty()) { continue; }
                 const CAircraftModelList dbModelsForSim = dbModels.matchesSimulator(singleInfo);
diff --git a/src/blackgui/components/datasettingscomponent.cpp b/src/blackgui/components/datasettingscomponent.cpp
index 778430431..7e9ef6a20 100644
--- a/src/blackgui/components/datasettingscomponent.cpp
+++ b/src/blackgui/components/datasettingscomponent.cpp
@@ -28,7 +28,7 @@ namespace BlackGui
         CDataSettingsComponent::~CDataSettingsComponent()
         { }
 
-        void CDataSettingsComponent::setBackgroundUpdater(CBackgroundDataUpdater *updater)
+        void CDataSettingsComponent::setBackgroundUpdater(const CBackgroundDataUpdater *updater)
         {
             ui->comp_ModelSettings->setBackgroundUpdater(updater);
         }
diff --git a/src/blackgui/components/datasettingscomponent.h b/src/blackgui/components/datasettingscomponent.h
index 596a8447c..0e1adcd4c 100644
--- a/src/blackgui/components/datasettingscomponent.h
+++ b/src/blackgui/components/datasettingscomponent.h
@@ -40,7 +40,7 @@ namespace BlackGui
             virtual ~CDataSettingsComponent();
 
             //! Background updater
-            void setBackgroundUpdater(BlackCore::Db::CBackgroundDataUpdater *updater);
+            void setBackgroundUpdater(const BlackCore::Db::CBackgroundDataUpdater *updater);
 
         private:
             QScopedPointer<Ui::CDataSettingsComponent> ui;
diff --git a/src/blackgui/components/settingsmodelcomponent.cpp b/src/blackgui/components/settingsmodelcomponent.cpp
index 10be5c5ed..40e308535 100644
--- a/src/blackgui/components/settingsmodelcomponent.cpp
+++ b/src/blackgui/components/settingsmodelcomponent.cpp
@@ -49,7 +49,7 @@ namespace BlackGui
             return ok ? secs : -1;
         }
 
-        void CSettingsModelComponent::setBackgroundUpdater(BlackCore::Db::CBackgroundDataUpdater *updater)
+        void CSettingsModelComponent::setBackgroundUpdater(const BlackCore::Db::CBackgroundDataUpdater *updater)
         {
             m_updater = updater;
         }
diff --git a/src/blackgui/components/settingsmodelcomponent.h b/src/blackgui/components/settingsmodelcomponent.h
index 68171bf6b..2f4912cb8 100644
--- a/src/blackgui/components/settingsmodelcomponent.h
+++ b/src/blackgui/components/settingsmodelcomponent.h
@@ -39,12 +39,12 @@ namespace BlackGui
             int getBackgroundUpdaterIntervallSecs() const;
 
             //! Updater (the updater this setting is for)
-            void setBackgroundUpdater(BlackCore::Db::CBackgroundDataUpdater *updater);
+            void setBackgroundUpdater(const BlackCore::Db::CBackgroundDataUpdater *updater);
 
         private:
             QScopedPointer<Ui::CSettingsModelComponent> ui;
             BlackMisc::CSetting<BlackGui::Settings::TBackgroundConsolidation> m_consolidationSetting { this, &CSettingsModelComponent::cacheChanged }; //!< consolidation time
-            BlackCore::Db::CBackgroundDataUpdater *m_updater = nullptr; //!< externally (i.e. other component) provided existing updater
+            const BlackCore::Db::CBackgroundDataUpdater *m_updater = nullptr; //!< externally (i.e. other component) provided existing updater
 
             //! Consolidation time entered
             void consolidationEntered();