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

Do not insert simconnect objects, which are not belonging to us

Browse Source 
This issue was most probably caused by a parallel SB installation.
For some strange reason, a simconnect object id was received
which was not added by swift. With this commit such situations
are handled correctly.
This commit is contained in:
Roland Winklmeier
2014-05-25 14:50:09 +02:00
committed by Klaus Basan
parent 83be80eea1
commit 9feb4f39dc
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/plugins/simulator/fsx/simulator_fsx.cpp
View File

@@ -307,6 +307,20 @@ namespace BlackSimPlugin
void CSimulatorFsx::setSimconnectObjectID(DWORD requestID, DWORD objectID) void CSimulatorFsx::setSimconnectObjectID(DWORD requestID, DWORD objectID)
{ {
// First check, if this request id belongs to us
auto it = m_simConnectObjects.begin();
for (; it != m_simConnectObjects.end(); ++it)
{
if ((*it).getRequestId() == static_cast<int>(requestID))
{
break;
}
}
if ( it == m_simConnectObjects.end() )
return;
(*it).setObjectId(objectID);
SimConnect_AIReleaseControl(m_hSimConnect, objectID, requestID); SimConnect_AIReleaseControl(m_hSimConnect, objectID, requestID);
SimConnect_TransmitClientEvent(m_hSimConnect, objectID, EVENT_FREEZELAT, 1, SimConnect_TransmitClientEvent(m_hSimConnect, objectID, EVENT_FREEZELAT, 1,
SIMCONNECT_GROUP_PRIORITY_HIGHEST, SIMCONNECT_EVENT_FLAG_GROUPID_IS_PRIORITY); SIMCONNECT_GROUP_PRIORITY_HIGHEST, SIMCONNECT_EVENT_FLAG_GROUPID_IS_PRIORITY);
@@ -319,20 +333,6 @@ namespace BlackSimPlugin
gearHandle.gearHandlePosition = 1; gearHandle.gearHandlePosition = 1;
SimConnect_SetDataOnSimObject(m_hSimConnect, CSimConnectDataDefinition::DataDefinitionGearHandlePosition, objectID, SIMCONNECT_DATA_SET_FLAG_DEFAULT, 0, sizeof(gearHandle), &gearHandle); SimConnect_SetDataOnSimObject(m_hSimConnect, CSimConnectDataDefinition::DataDefinitionGearHandlePosition, objectID, SIMCONNECT_DATA_SET_FLAG_DEFAULT, 0, sizeof(gearHandle), &gearHandle);
CSimConnectObject simObject;
auto it = m_simConnectObjects.begin();
for (; it != m_simConnectObjects.end(); ++it)
{
if ((*it).getRequestId() == static_cast<int>(requestID))
{
(*it).setObjectId(objectID);
break;
}
}
if (it != m_simConnectObjects.end())
m_simConnectObjects.insert(simObject.getCallsign(), simObject);
} }
void CSimulatorFsx::timerEvent(QTimerEvent * /* event */) void CSimulatorFsx::timerEvent(QTimerEvent * /* event */)