diff --git a/src/plugins/simulator/fs9/simulatorfs9.cpp b/src/plugins/simulator/fs9/simulatorfs9.cpp index 97b5780ac..5370ec024 100644 --- a/src/plugins/simulator/fs9/simulatorfs9.cpp +++ b/src/plugins/simulator/fs9/simulatorfs9.cpp @@ -377,7 +377,7 @@ namespace BlackSimPlugin } else { - m_skipCockpitUpdateCycles--; + --m_skipCockpitUpdateCycles; } const CAircraftSituation aircraftSituation = simDataOwnAircraft.getSituation(); diff --git a/src/plugins/simulator/fs9/simulatorfs9.h b/src/plugins/simulator/fs9/simulatorfs9.h index 0e7535148..3743441af 100644 --- a/src/plugins/simulator/fs9/simulatorfs9.h +++ b/src/plugins/simulator/fs9/simulatorfs9.h @@ -104,11 +104,10 @@ namespace BlackSimPlugin void synchronizeTime(); QHash> m_hashFs9Clients; - QMetaObject::Connection m_connectionHostMessages; - bool m_simConnected = false; //!< Is simulator connected? - QSharedPointer m_fs9Host; + QMetaObject::Connection m_connectionHostMessages; + bool m_simConnected = false; //!< Is simulator connected? + QSharedPointer m_fs9Host; QSharedPointer m_lobbyClient; - int m_skipCockpitUpdateCycles = 0; //!< skip some update cycles to allow changes in simulator cockpit to be set static constexpr int SkipUpdateCyclesForCockpit = 10; }; diff --git a/src/plugins/simulator/fscommon/simulatorfscommon.cpp b/src/plugins/simulator/fscommon/simulatorfscommon.cpp index abede1dd8..94ed4ccec 100644 --- a/src/plugins/simulator/fscommon/simulatorfscommon.cpp +++ b/src/plugins/simulator/fscommon/simulatorfscommon.cpp @@ -71,6 +71,8 @@ namespace BlackSimPlugin void CSimulatorFsCommon::reset() { m_ownAircraftUpdateCycles = 0; + m_skipCockpitUpdateCycles = 0; + ISimulator::reset(); } diff --git a/src/plugins/simulator/fscommon/simulatorfscommon.h b/src/plugins/simulator/fscommon/simulatorfscommon.h index 55cee9c1e..21aecdf04 100644 --- a/src/plugins/simulator/fscommon/simulatorfscommon.h +++ b/src/plugins/simulator/fscommon/simulatorfscommon.h @@ -83,6 +83,7 @@ namespace BlackSimPlugin CFsuipc *m_fsuipc = nullptr; //!< FSUIPC int m_ownAircraftUpdateCycles = 0; //!< own aircraft updates, even with 50 updates/sec long enough even for 32bit + int m_skipCockpitUpdateCycles = 0; //!< skip some update cycles to allow changes in simulator cockpit to be set bool m_useFsuipc = false; //!< use FSUIPC bool m_simPaused = false; //!< simulator paused? bool m_simTimeSynced = false; //!< time synchronized? diff --git a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp index d8e554095..5446c7fa7 100644 --- a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp +++ b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp @@ -2497,7 +2497,6 @@ namespace BlackSimPlugin m_simSimulating = false; m_sbDataReceived = 0; m_syncTimeDeferredCounter = 0; - m_skipCockpitUpdateCycles = 0; m_requestIdSimObjAircraft = static_cast(RequestSimObjAircraftStart); m_dispatchErrors = 0; m_receiveExceptionCount = 0; diff --git a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h index 4c4253536..e3d362183 100644 --- a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h +++ b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h @@ -594,7 +594,6 @@ namespace BlackSimPlugin qint64 m_simulatingChangedTs = -1; //!< timestamp, when simulating changed (used to avoid jitter) int m_sbDataReceived = 0; //!< SB3 area data received int m_syncTimeDeferredCounter = 0; //!< Set when synchronized, used to wait some time - int m_skipCockpitUpdateCycles = 0; //!< skip some update cycles to allow changes in simulator cockpit to be set // tracing dispatch performance int m_dispatchErrors = 0; //!< number of dispatched failed, \sa dispatch