From 5c1f6d90294cac6efb073bf9e31d6356154610b3 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Thu, 17 Jan 2019 17:16:37 +0100
Subject: [PATCH] Ref T515, minor tweaks

---
 src/blackgui/menus/aircraftmodelmenus.cpp | 6 ++----
 src/blackgui/menus/aircraftmodelmenus.h   | 2 +-
 src/blackgui/views/aircraftmodelview.cpp  | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/blackgui/menus/aircraftmodelmenus.cpp b/src/blackgui/menus/aircraftmodelmenus.cpp
index 2c09bcaf5..4dc81b959 100644
--- a/src/blackgui/menus/aircraftmodelmenus.cpp
+++ b/src/blackgui/menus/aircraftmodelmenus.cpp
@@ -179,7 +179,7 @@ namespace BlackGui
         void CConsolidateWithDbDataMenu::customMenu(CMenuActions &menuActions)
         {
             const CAircraftModelView *mv = modelView();
-            if (mv->isEmpty()) { this->nestedCustomMenu(menuActions); return; }
+            if (!mv || mv->isEmpty()) { this->nestedCustomMenu(menuActions); return; }
             if (!sGui->hasWebDataServices()) { this->nestedCustomMenu(menuActions); return; }
 
             menuActions.addMenuConsolidateModels();
@@ -194,9 +194,7 @@ namespace BlackGui
 
         void CConsolidateWithDbDataMenu::consolidateData()
         {
-            BLACK_VERIFY_X(sGui, Q_FUNC_INFO, "Missing sGui");
-            if (!sGui->hasWebDataServices()) { return; }
-
+            if (!sGui || sGui->isShuttingDown() || !sGui->hasWebDataServices()) { return; }
             const CAircraftModelList dbModels(sGui->getWebDataServices()->getModels());
             if (dbModels.isEmpty())
             {
diff --git a/src/blackgui/menus/aircraftmodelmenus.h b/src/blackgui/menus/aircraftmodelmenus.h
index e3e2fec54..3f6228c1a 100644
--- a/src/blackgui/menus/aircraftmodelmenus.h
+++ b/src/blackgui/menus/aircraftmodelmenus.h
@@ -81,7 +81,7 @@ namespace BlackGui
             QAction *m_modelConverterX = nullptr;
         };
 
-        //! Merge with DB data
+        //! Consolidate/merge with DB data
         class CConsolidateWithDbDataMenu : public IAircraftModelViewMenu
         {
             Q_OBJECT
diff --git a/src/blackgui/views/aircraftmodelview.cpp b/src/blackgui/views/aircraftmodelview.cpp
index 8b80b569f..9450e0b50 100644
--- a/src/blackgui/views/aircraftmodelview.cpp
+++ b/src/blackgui/views/aircraftmodelview.cpp
@@ -100,7 +100,7 @@ namespace BlackGui
         int CAircraftModelView::applyToSelected(const CDistributor &distributor)
         {
             if (!hasSelection()) { return 0; }
-            int c = this->updateSelected(CVariant::from(distributor), CAircraftModel::IndexDistributor);
+            const int c = this->updateSelected(CVariant::from(distributor), CAircraftModel::IndexDistributor);
             return c;
         }