From d3901166666adbbcc80bbd439bb0cdc61301631f Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Wed, 18 Apr 2018 06:46:10 +0200
Subject: [PATCH] Relay when simulator isAvailable, otherwise FSX/P3D misses
 all calls when loading scenery or paused

---
 .../context/contextsimulatorimpl.cpp          | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/blackcore/context/contextsimulatorimpl.cpp b/src/blackcore/context/contextsimulatorimpl.cpp
index 416630449..9e8976f4c 100644
--- a/src/blackcore/context/contextsimulatorimpl.cpp
+++ b/src/blackcore/context/contextsimulatorimpl.cpp
@@ -481,7 +481,7 @@ namespace BlackCore
 
         void CContextSimulator::xCtxAddedRemoteAircraft(const CSimulatedAircraft &remoteAircraft)
         {
-            if (!isSimulatorSimulating()) { return; }
+            if (!this->isSimulatorAvailable()) { return; }
             const CCallsign callsign = remoteAircraft.getCallsign();
             BLACK_VERIFY_X(!callsign.isEmpty(), Q_FUNC_INFO, "Remote aircraft with empty callsign");
             if (callsign.isEmpty()) { return; }
@@ -503,7 +503,7 @@ namespace BlackCore
 
         void CContextSimulator::xCtxRemovedRemoteAircraft(const CCallsign &callsign)
         {
-            if (!isSimulatorSimulating()) { return; }
+            if (!this->isSimulatorAvailable()) { return; }
             m_simulatorPlugin.second->logicallyRemoveRemoteAircraft(callsign);
         }
 
@@ -542,7 +542,7 @@ namespace BlackCore
 
         void CContextSimulator::xCtxTextMessagesReceived(const Network::CTextMessageList &textMessages)
         {
-            if (!isSimulatorSimulating()) { return; }
+            if (!this->isSimulatorAvailable()) { return; }
             if (!this->getIContextOwnAircraft()) { return; }
             const CSimulatorMessagesSettings settings = m_messageSettings.getThreadLocal();
             const CSimulatedAircraft ownAircraft = this->getIContextOwnAircraft()->getOwnAircraft();
@@ -561,20 +561,20 @@ namespace BlackCore
 
         void CContextSimulator::onReceivedRequestedElevation(const CElevationPlane &plane, const CCallsign &callsign)
         {
-            if (!isSimulatorSimulating()) { return; }
+            if (!this->isSimulatorAvailable()) { return; }
             emit this->receivedRequestedElevation(plane, callsign);
         }
 
         void CContextSimulator::xCtxChangedRemoteAircraftModel(const CSimulatedAircraft &aircraft, const BlackMisc::CIdentifier &originator)
         {
             if (CIdentifiable::isMyIdentifier(originator)) { return; }
-            if (!isSimulatorSimulating()) { return; }
+            if (!this->isSimulatorAvailable()) { return; }
             m_simulatorPlugin.second->changeRemoteAircraftModel(aircraft);
         }
 
         void CContextSimulator::xCtxChangedRemoteAircraftEnabled(const CSimulatedAircraft &aircraft)
         {
-            if (!isSimulatorSimulating()) { return; }
+            if (!this->isSimulatorAvailable()) { return; }
             m_simulatorPlugin.second->changeRemoteAircraftEnabled(aircraft);
         }
 
@@ -604,13 +604,13 @@ namespace BlackCore
 
         void CContextSimulator::addingRemoteAircraftFailed(const CSimulatedAircraft &remoteAircraft, const CStatusMessage &message)
         {
-            if (!isSimulatorSimulating()) { return; }
+            if (!this->isSimulatorAvailable()) { return; }
             emit this->addingRemoteModelFailed(remoteAircraft, message);
         }
 
         void CContextSimulator::xCtxUpdateSimulatorCockpitFromContext(const CSimulatedAircraft &ownAircraft, const CIdentifier &originator)
         {
-            if (!isSimulatorSimulating()) { return; }
+            if (!this->isSimulatorAvailable()) { return; }
             if (originator.getName().isEmpty() || originator == IContextSimulator::InterfaceName()) { return; }
 
             // update
@@ -619,7 +619,7 @@ namespace BlackCore
 
         void CContextSimulator::xCtxUpdateSimulatorSelcalFromContext(const CSelcal &selcal, const CIdentifier &originator)
         {
-            if (!isSimulatorSimulating()) { return; }
+            if (!this->isSimulatorAvailable()) { return; }
             if (originator.getName().isEmpty() || originator == IContextSimulator::InterfaceName()) { return; }
 
             // update
@@ -634,7 +634,7 @@ namespace BlackCore
 
         void CContextSimulator::relayStatusMessageToSimulator(const BlackMisc::CStatusMessage &message)
         {
-            if (!isSimulatorSimulating()) { return; }
+            if (!this->isSimulatorAvailable()) { return; }
             const CSimulatorMessagesSettings simMsg = m_messageSettings.getThreadLocal();
             if (simMsg.relayThisStatusMessage(message))
             {