flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-19 20:25:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T275, FSX/P3D check if SimObject has been removed

Browse Source
This commit is contained in:
Klaus Basan
2018-06-12 02:05:36 +02:00
parent c58f02bf41
commit 2b3b0bd9ee
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp
View File

@@ -1654,6 +1654,7 @@ namespace BlackSimPlugin
if (!simObject.hasValidRequestAndObjectId()) { return false; } if (!simObject.hasValidRequestAndObjectId()) { return false; }
if (simObject.isPending()) { return false; } // wait until confirmed if (simObject.isPending()) { return false; } // wait until confirmed
if (simObject.getSimDataPeriod() == period) { return true; } // already queried like this if (simObject.getSimDataPeriod() == period) { return true; } // already queried like this
if (!m_simConnectObjects.contains(simObject.getCallsign())) { return false; } // removed in meantime
// always request, not only when something has changed // always request, not only when something has changed
const HRESULT result = SimConnect_RequestDataOnSimObject( const HRESULT result = SimConnect_RequestDataOnSimObject(
@@ -1661,7 +1662,7 @@ namespace BlackSimPlugin
CSimConnectDefinitions::DataRemoteAircraftGetPosition, CSimConnectDefinitions::DataRemoteAircraftGetPosition,
simObject.getObjectId(), period); simObject.getObjectId(), period);
if (result == S_OK && m_simConnectObjects.contains(simObject.getCallsign())) if (result == S_OK)
{ {
m_requestSimObjectDataCount++; m_requestSimObjectDataCount++;
if (this->isTracingSendId()) { this->traceSendId(simObject.getObjectId(), Q_FUNC_INFO);} if (this->isTracingSendId()) { this->traceSendId(simObject.getObjectId(), Q_FUNC_INFO);}
@@ -1677,16 +1678,18 @@ namespace BlackSimPlugin
bool CSimulatorFsxCommon::requestTerrainProbeData(const CCallsign &callsign) bool CSimulatorFsxCommon::requestTerrainProbeData(const CCallsign &callsign)
{ {
if (m_simConnectProbes.countConfirmedAdded() < 1) { return false; } if (m_simConnectProbes.countConfirmedAdded() < 1) { return false; }
if (!m_simConnectObjects.contains(callsign)) { return false; } // removed in meantime
const DWORD id = this->obtainRequestIdForProbe(); const DWORD id = this->obtainRequestIdForProbe();
const DWORD objectId = m_simConnectProbes.values().front().getObjectId(); const DWORD objectId = m_simConnectProbes.values().front().getObjectId();
const HRESULT result = SimConnect_RequestDataOnSimObject( const HRESULT result = SimConnect_RequestDataOnSimObject(
m_hSimConnect, id, m_hSimConnect, id,
CSimConnectDefinitions::DataRemoteAircraftGetPosition, CSimConnectDefinitions::DataRemoteAircraftGetPosition,
objectId, SIMCONNECT_PERIOD_ONCE); objectId, SIMCONNECT_PERIOD_ONCE);
if (this->isTracingSendId()) { this->traceSendId(id, Q_FUNC_INFO); }
if (result == S_OK) if (result == S_OK)
{ {
if (this->isTracingSendId()) { this->traceSendId(id, Q_FUNC_INFO); }
m_pendingProbeRequests.insert(id, callsign); m_pendingProbeRequests.insert(id, callsign);
return true; return true;
} }
@@ -1698,6 +1701,7 @@ namespace BlackSimPlugin
{ {
if (!simObject.hasValidRequestAndObjectId()) { return false; } if (!simObject.hasValidRequestAndObjectId()) { return false; }
if (simObject.isPendingRemoved()) { return false; } if (simObject.isPendingRemoved()) { return false; }
if (!m_simConnectObjects.contains(simObject.getCallsign())) { return false; } // removed in meantime
if (!m_hSimConnect) { return false; } if (!m_hSimConnect) { return false; }
// always request, not only when something has changed // always request, not only when something has changed