diff --git a/src/blackgui/loadindicator.cpp b/src/blackgui/loadindicator.cpp index 82cc0d772..cd495e4e7 100644 --- a/src/blackgui/loadindicator.cpp +++ b/src/blackgui/loadindicator.cpp @@ -69,9 +69,9 @@ namespace BlackGui void CLoadIndicator::setAnimationDelay(int delay) { - if (this->m_timerId != -1) { killTimer(this->m_timerId); } this->m_delayMs = delay; - if (this->m_timerId != -1) { this->m_timerId = startTimer(this->m_delayMs); } + if (this->m_timerId != -1) { killTimer(this->m_timerId); } + this->m_timerId = startTimer(this->m_delayMs); } void CLoadIndicator::setColor(const QColor &color) diff --git a/src/plugins/simulator/fsx/simulatorfsx.cpp b/src/plugins/simulator/fsx/simulatorfsx.cpp index 1680fc636..458ceecc2 100644 --- a/src/plugins/simulator/fsx/simulatorfsx.cpp +++ b/src/plugins/simulator/fsx/simulatorfsx.cpp @@ -104,11 +104,8 @@ namespace BlackSimPlugin bool CSimulatorFsx::disconnectFrom() { if (!m_simConnected) { return true; } - if (m_simconnectTimerId >= 0) - { - killTimer(m_simconnectTimerId); - m_simconnectTimerId = -1; - } + if (m_simconnectTimerId >= 0) { killTimer(m_simconnectTimerId); } + m_simconnectTimerId = -1; if (m_hSimConnect) { SimConnect_Close(m_hSimConnect); @@ -1042,15 +1039,11 @@ namespace BlackSimPlugin void CSimulatorFsx::reset() { - if (m_simconnectTimerId >= 0) - { - killTimer(m_simconnectTimerId); - m_simconnectTimerId = -1; - } + if (m_simconnectTimerId >= 0) { killTimer(m_simconnectTimerId); } + m_simconnectTimerId = -1; m_simConnected = false; m_simSimulating = false; m_syncDeferredCounter = 0; - m_simconnectTimerId = -1; m_skipCockpitUpdateCycles = 0; m_interpolationRequest = 0; m_interpolationsSkipped = 0;