Index: src/libchengine/TSubTaskStatsSnapshot.cpp =================================================================== diff -u -N -r9ddf8fdd5f641491dd30c49eb90f8f740314b6af -r9fcf462ad4a28203a3d34ded6da7125d4dcc925c --- src/libchengine/TSubTaskStatsSnapshot.cpp (.../TSubTaskStatsSnapshot.cpp) (revision 9ddf8fdd5f641491dd30c49eb90f8f740314b6af) +++ src/libchengine/TSubTaskStatsSnapshot.cpp (.../TSubTaskStatsSnapshot.cpp) (revision 9fcf462ad4a28203a3d34ded6da7125d4dcc925c) @@ -98,10 +98,7 @@ double TSubTaskStatsSnapshot::GetSizeSpeed() const { - if(m_bSubTaskIsRunning) - return m_dSizeSpeed; - - return 0.0; + return m_dAvgSizeSpeed; } void TSubTaskStatsSnapshot::SetCountSpeed(double dCountSpeed) @@ -116,22 +113,6 @@ return 0.0; } - double TSubTaskStatsSnapshot::GetAvgSizeSpeed() const - { - if (m_timeElapsed) - return Math::Div64(m_ullProcessedSize, m_timeElapsed / 1000.0); - - return 0.0; - } - - double TSubTaskStatsSnapshot::GetAvgCountSpeed() const - { - if (m_timeElapsed) - return Math::Div64(m_fcProcessedCount, m_timeElapsed / 1000.0); - - return 0.0; - } - double TSubTaskStatsSnapshot::GetCombinedProgress() const { return CalculateProgress();