From 90ea704b31a3d6b566ccbe00e7dcc71e1b10273c Mon Sep 17 00:00:00 2001 From: Eric Price <eric.price@tuebingen.mpg.de> Date: Mon, 6 Feb 2017 14:05:46 +0100 Subject: [PATCH] LP-485 GCS: Logfile replay playback speed too fast wrong variable type --- ground/gcs/src/libs/utils/logfile.cpp | 4 ++-- ground/gcs/src/libs/utils/logfile.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ground/gcs/src/libs/utils/logfile.cpp b/ground/gcs/src/libs/utils/logfile.cpp index 4dad41bf3..520085b73 100644 --- a/ground/gcs/src/libs/utils/logfile.cpp +++ b/ground/gcs/src/libs/utils/logfile.cpp @@ -103,8 +103,8 @@ void LogFile::timerFired() time = m_myTime.elapsed(); // TODO: going back in time will be a problem - while ((m_lastPlayed + ((time - m_timeOffset) * m_playbackSpeed) > m_lastTimeStamp)) { - m_lastPlayed += ((time - m_timeOffset) * m_playbackSpeed); + while ((m_lastPlayed + ((double)(time - m_timeOffset) * m_playbackSpeed) > m_lastTimeStamp)) { + m_lastPlayed += ((double)(time - m_timeOffset) * m_playbackSpeed); if (m_file.bytesAvailable() < (qint64)sizeof(dataSize)) { stopReplay(); return; diff --git a/ground/gcs/src/libs/utils/logfile.h b/ground/gcs/src/libs/utils/logfile.h index 0f84ad5d8..88319109d 100644 --- a/ground/gcs/src/libs/utils/logfile.h +++ b/ground/gcs/src/libs/utils/logfile.h @@ -63,7 +63,7 @@ protected: QTime m_myTime; QFile m_file; qint32 m_lastTimeStamp; - qint32 m_lastPlayed; + double m_lastPlayed; QMutex m_mutex;