Guarding by "hasWebDataServices"

src/blackcore/afv/clients/afvclient.cpp

@@ -1113,10 +1113,10 @@ namespace BlackCore
 
                     if (it != m_aliasedStations.end())
                     {
-                        if (sApp->getIContextNetwork())
+                        if (sApp && sApp->getIContextNetwork())
                         {
                             // Get the callsign for this frequency and fuzzy compare with our alias station
-                            // !\todo KB 2019-10 replace by com unit channel spacing
+                            // !\todo KB 2019-10 replace by COM unit channel spacing
                             const CComSystem::ChannelSpacing spacing = CComSystem::ChannelSpacing25KHz;
                             const CFrequency f(static_cast<int>(roundedFrequencyHz), CFrequencyUnit::Hz());
                             const CAtcStationList matchingAtcStations = sApp->getIContextNetwork()->getOnlineStationsForFrequency(f, spacing);

src/blackcore/aircraftmatcher.cpp

@@ -47,7 +47,7 @@ namespace BlackCore
 
     CAircraftMatcher::CAircraftMatcher(const CAircraftMatcherSetup &setup, QObject *parent) : QObject(parent), m_setup(setup)
     {
-        if (sApp && !sApp->isShuttingDown())
+        if (sApp && sApp->hasWebDataServices())
         {
             sApp->getWebDataServices()->synchronizeDbCaches(CEntityFlags::AircraftCategoryEntity);
             const CAircraftCategoryList categories = sApp->getWebDataServices()->getAircraftCategories();
@@ -513,7 +513,8 @@ namespace BlackCore
         const CCallsign callsign = inModel.getCallsign();
 
         if (js.isEmpty() && log) { CLogUtilities::addLogDetailsToList(log, callsign, QStringLiteral("Matching script is empty")); }
-        while (!js.isEmpty() && sApp && !sApp->isShuttingDown())
+
+        while (!js.isEmpty() && sApp && sApp->hasWebDataServices())
         {
             rv.runScript = true;
 

src/blackcore/airspacemonitor.cpp

@@ -94,7 +94,7 @@ namespace BlackCore
         connect(m_fsdClient, &CFSDClient::connectionStatusChanged,         this, &CAirspaceMonitor::onConnectionStatusChanged);
 
         // AutoConnection: this should also avoid race conditions by updating the bookings
-        Q_ASSERT_X(sApp && sApp->getWebDataServices(), Q_FUNC_INFO, "Missing data reader");
+        Q_ASSERT_X(sApp && sApp->hasWebDataServices(), Q_FUNC_INFO, "Missing data reader");
 
         // optional readers
         if (sApp && sApp->getWebDataServices()->getBookingReader())
@@ -340,7 +340,7 @@ namespace BlackCore
 
     void CAirspaceMonitor::requestAtcBookingsUpdate()
     {
-        if (!sApp || sApp->isShuttingDown()) { return; }
+        if (!sApp || sApp->isShuttingDown() || !sApp->hasWebDataServices()) { return; }
         sApp->getWebDataServices()->readInBackground(BlackMisc::Network::CEntityFlags::BookingEntity);
         m_bookingsRequested = true;
     }
@@ -1360,7 +1360,12 @@ namespace BlackCore
         CAircraftSituation correctedSituation(allowTestOffset ? this->addTestAltitudeOffsetToSituation(situation) : situation);
         bool haveRequestedElevation = false;
         const bool canLikelySkipNearGround = correctedSituation.canLikelySkipNearGroundInterpolation();
-        if (!correctedSituation.hasGroundElevation() && !canLikelySkipNearGround)
+        if (!correctedSituation.hasGroundElevation())
+        {
+            // set a defined state
+            correctedSituation.resetGroundElevation();
+
+            if (!canLikelySkipNearGround)
             {
                 // fetch from cache or request
                 const CAircraftSituationList situations   = this->remoteAircraftSituations(callsign);
@@ -1404,11 +1409,15 @@ namespace BlackCore
                         if (oldSituations.size() > 1)
                         {
                             const bool extrapolated = correctedSituation.extrapolateElevation(oldSituations[0], oldSituations[1], oldChanges.frontOrDefault());
-                        BLACK_AUDIT_X(extrapolated, Q_FUNC_INFO, "Cannot extrapolate");
+                            Q_UNUSED(extrapolated)
+
+                            // extrapolation only works if there is a provider and already data
+                            // BLACK_AUDIT_X(extrapolated, Q_FUNC_INFO, "Cannot extrapolate");
                         }
                     }
                 } // gnd. elevation
-        }
+            } // can skip?
+        } // have already elevation?
 
         // do we already have ground details?
         if (situation.getOnGroundDetails() == CAircraftSituation::NotSetGroundDetails)

src/blackgui/components/autopublishcomponent.cpp

@@ -38,7 +38,7 @@ namespace BlackGui
             connect(ui->pb_SendToDB,    &QPushButton::released, this, &CAutoPublishComponent::sendToDb, Qt::QueuedConnection);
             connect(ui->pb_DeleteFiles, &QPushButton::released, this, &CAutoPublishComponent::deleteAllFiles, Qt::QueuedConnection);
 
-            if (sGui && sGui->getWebDataServices() && sGui->getWebDataServices()->getDatabaseWriter())
+            if (sGui && sGui->hasWebDataServices() && sGui->getWebDataServices()->getDatabaseWriter())
             {
                 CDatabaseWriter *w = sGui->getWebDataServices()->getDatabaseWriter();
                 connect(w, &CDatabaseWriter::autoPublished, this, &CAutoPublishComponent::onAutoPublished, Qt::QueuedConnection);
@@ -77,7 +77,7 @@ namespace BlackGui
                 return;
             }
 
-            if (!sGui->getWebDataServices())
+            if (!sGui->hasWebDataServices())
             {
                 this->showOverlayHTMLMessage("No publishing web service!", 5000);
                 return;

src/blackgui/components/dbaircrafticaoselectorcomponent.cpp

@@ -49,8 +49,13 @@ namespace BlackGui
             this->setAcceptDrops(true);
             this->setAcceptedMetaTypeIds({qMetaTypeId<CAircraftIcaoCode>(), qMetaTypeId<CAircraftIcaoCodeList>()});
             ui->le_Aircraft->setValidator(new CUpperCaseValidator(this));
+
             connect(ui->le_Aircraft, &QLineEdit::editingFinished, this, &CDbAircraftIcaoSelectorComponent::onDataChanged);
+            if (sApp && sApp->hasWebDataServices())
+            {
                 connect(sApp->getWebDataServices(), &CWebDataServices::dataRead, this, &CDbAircraftIcaoSelectorComponent::onCodesRead, Qt::QueuedConnection);
+            }
+
             this->onCodesRead(CEntityFlags::AircraftIcaoEntity, CEntityFlags::ReadFinished, sApp->getWebDataServices()->getAircraftIcaoCodesCount());
         }