Ref T232, some (dispatch) timer code was duplicated

* fixed a bug, where a non existing timer was killed
* unified code in base class

src/blackcore/simulatorcommon.cpp

@@ -85,7 +85,10 @@ namespace BlackCore
         CLogMessage(this).info("Initialized simulator driver: '%1'") << m_simulatorPluginInfo.toQString();
     }
 
-    CSimulatorCommon::~CSimulatorCommon() { }
+    CSimulatorCommon::~CSimulatorCommon()
+    {
+        this->safeKillTimer();
+    }
 
     const CLogCategoryList &CSimulatorCommon::getLogCategories()
     {
@@ -500,6 +503,13 @@ namespace BlackCore
         this->blinkHighlightedAircraft();
     }
 
+    void CSimulatorCommon::safeKillTimer()
+    {
+        if (m_timerId < 0) { return; }
+        this->killTimer(m_timerId);
+        m_timerId = -1;
+    }
+
     void CSimulatorCommon::onRecalculatedRenderedAircraft(const CAirspaceAircraftSnapshot &snapshot)
     {
         if (!snapshot.isValidSnapshot()) { return;}

src/blackcore/simulatorcommon.h

@@ -206,8 +206,12 @@ namespace BlackCore
         //! Slow timer used to highlight aircraft, can be used for other things too
         virtual void oneSecondTimerTimeout();
 
+        //! Kill timer if id is valid
+        void safeKillTimer();
+
         bool m_pausedSimFreezesInterpolation = false;                      //!< paused simulator will also pause interpolation (so AI aircraft will hold)
         bool m_autoCalcAirportDistance = true;                             //!< automatically calculate airport distance and bearing
+        int    m_timerId = -1;                                             //!< dispatch timer id
         int    m_statsUpdateAircraftCountMs = 0;                           //!< statistics update count
         qint64 m_statsUpdateAircraftTimeTotalMs = 0;                       //!< statistics update time
         qint64 m_statsUpdateAircraftTimeAvgMs = 0;                         //!< statistics update time

src/plugins/simulator/fs9/simulatorfs9.cpp

@@ -144,7 +144,7 @@ namespace BlackSimPlugin
                 m_fsuipc->connect(); // connect FSUIPC too
             }
             initSimulatorInternals();
-            m_dispatchTimerId = startTimer(50);
+            m_timerId = startTimer(50);
             return true;
         }
 
@@ -154,8 +154,7 @@ namespace BlackSimPlugin
 
             // Don't forward messages when disconnected
             disconnect(m_connectionHostMessages);
-            killTimer(m_dispatchTimerId);
+            safeKillTimer();
-            m_dispatchTimerId = -1;
             disconnectAllClients();
 
             //  disconnect FSUIPC and status

src/plugins/simulator/fs9/simulatorfs9.h

@@ -102,7 +102,6 @@ namespace BlackSimPlugin
 
             QHash<BlackMisc::Aviation::CCallsign, QPointer<CFs9Client>> m_hashFs9Clients;
             QMetaObject::Connection m_connectionHostMessages;
-            int m_dispatchTimerId = -1;
             bool m_simConnected = false; //!< Is simulator connected?
             QSharedPointer<CFs9Host> m_fs9Host;
             QSharedPointer<CLobbyClient> m_lobbyClient;

src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp

@@ -90,7 +90,7 @@ namespace BlackSimPlugin
             // set structures and move on
             this->initEvents();
             this->initDataDefinitionsWhenConnected();
-            m_simConnectTimerId = startTimer(DispatchIntervalMs);
+            m_timerId = startTimer(DispatchIntervalMs);
             // do not start m_addPendingAircraftTimer here, it will be started when object was added
 
             return true;
@@ -99,8 +99,7 @@ namespace BlackSimPlugin
         bool CSimulatorFsxCommon::disconnectFrom()
         {
             if (!m_simConnected) { return true; }
-            if (m_simConnectTimerId >= 0) { killTimer(m_simConnectTimerId); }
+            this->safeKillTimer();
-            m_simConnectTimerId = -1;
             m_simSimulating = false; // treat as stopped, just setting the flag here avoids overhead of on onSimStopped
             if (m_hSimConnect)
             {
@@ -338,7 +337,7 @@ namespace BlackSimPlugin
         {
             // reset complete state, we are going down
             m_simulatingChangedTs = QDateTime::currentMSecsSinceEpoch();
-            if (m_simConnectTimerId >= 0) { killTimer(m_simConnectTimerId); }
+            this->safeKillTimer();
 
             // if called from dispatch function, avoid that SimConnectProc disconnects itself while in SimConnectProc
             QTimer::singleShot(0, this, &CSimulatorFsxCommon::disconnectFrom);
@@ -1503,8 +1502,7 @@ namespace BlackSimPlugin
 
         void CSimulatorFsxCommon::reset()
         {
-            if (m_simConnectTimerId >= 0) { killTimer(m_simConnectTimerId); }
+            this->safeKillTimer();
-            m_simConnectTimerId = -1;
             m_simulatingChangedTs = -1;
             m_simConnected = false;
             m_simSimulating = false;

src/plugins/simulator/fsxcommon/simulatorfsxcommon.h

@@ -154,7 +154,7 @@ namespace BlackSimPlugin
             //! @}
 
             //! Timer event (our SimConnect event loop), runs dispatch
-            //! \sa m_simconnectTimerId
+            //! \sa m_timerId
             //! \sa CSimulatorFsxCommon::dispatch
             virtual void timerEvent(QTimerEvent *event) override;
 
@@ -354,7 +354,6 @@ namespace BlackSimPlugin
             bool m_traceSendId   = false;           //!< trace the send ids, meant for dedugging
             qint64 m_simulatingChangedTs = -1;      //!< timestamp, when simulating changed (used to avoid jitter)
             int  m_syncDeferredCounter =  0;        //!< Set when synchronized, used to wait some time
-            int  m_simConnectTimerId = -1;          //!< Timer identifier
             int  m_skipCockpitUpdateCycles = 0;     //!< skip some update cycles to allow changes in simulator cockpit to be set
             int  m_interpolationRequest = 0;        //!< current interpolation request
             int  m_dispatchErrors = 0;              //!< number of dispatched failed, \sa dispatch