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

[FSD] Fix broadcasting of incremental aircraft config updates

Browse Source
This commit is contained in:
Roland Rossgotterer
2019-10-16 16:23:57 +02:00
committed by Klaus Basan
parent 2362e25593
commit cf50d50f4f
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/blackcore/fsd/fsdclient.cpp
View File

@@ -99,7 +99,6 @@ namespace BlackCore
connect(&m_interimPositionUpdateTimer, &QTimer::timeout, this, &CFSDClient::sendInterimPilotDataUpdate); connect(&m_interimPositionUpdateTimer, &QTimer::timeout, this, &CFSDClient::sendInterimPilotDataUpdate);
connect(&m_scheduledConfigUpdate, &QTimer::timeout, this, &CFSDClient::sendIncrementalAircraftConfig); connect(&m_scheduledConfigUpdate, &QTimer::timeout, this, &CFSDClient::sendIncrementalAircraftConfig);
m_scheduledConfigUpdate.setSingleShot(true);
fsdMessageSettingsChanged(); fsdMessageSettingsChanged();
@@ -761,16 +760,8 @@ namespace BlackCore
// If it hasn't changed, return // If it hasn't changed, return
if (m_sentAircraftConfig == currentParts) { return; } if (m_sentAircraftConfig == currentParts) { return; }
if (!m_tokenBucket.tryConsume()) if (!m_tokenBucket.tryConsume()) { return; }
{
// If timer is not yet active, start it
if (!m_scheduledConfigUpdate.isActive()) m_scheduledConfigUpdate.start(1000);
return;
}
// Method could have been triggered by another change in aircraft config
// so a previous update might still be scheduled. Stop it.
if (m_scheduledConfigUpdate.isActive()) m_scheduledConfigUpdate.stop();
const QJsonObject previousConfig = m_sentAircraftConfig.toJson(); const QJsonObject previousConfig = m_sentAircraftConfig.toJson();
const QJsonObject currentConfig = currentParts.toJson(); const QJsonObject currentConfig = currentParts.toJson();
const QJsonObject incrementalConfig = getIncrementalObject(previousConfig, currentConfig); const QJsonObject incrementalConfig = getIncrementalObject(previousConfig, currentConfig);
@@ -1780,6 +1771,7 @@ namespace BlackCore
void CFSDClient::startPositionTimers() void CFSDClient::startPositionTimers()
{ {
m_positionUpdateTimer.start(c_updatePostionIntervalMsec); m_positionUpdateTimer.start(c_updatePostionIntervalMsec);
m_scheduledConfigUpdate.start(c_processingIntervalMsec);
if (this->isInterimPositionSendingEnabledForServer()) { m_interimPositionUpdateTimer.start(c_updateInterimPostionIntervalMsec); } if (this->isInterimPositionSendingEnabledForServer()) { m_interimPositionUpdateTimer.start(c_updateInterimPostionIntervalMsec); }
} }
@@ -1787,6 +1779,7 @@ namespace BlackCore
{ {
m_positionUpdateTimer.stop(); m_positionUpdateTimer.stop();
m_interimPositionUpdateTimer.stop(); m_interimPositionUpdateTimer.stop();
m_scheduledConfigUpdate.stop();
} }
void CFSDClient::updateAtisMap(const QString &callsign, AtisLineType type, const QString &line) void CFSDClient::updateAtisMap(const QString &callsign, AtisLineType type, const QString &line)