Index: src/ch/task.cpp =================================================================== diff -u -N -rb13e3052f13b2f0a8c53c37a7b9246418b88bebd -r074c36e6d7abda459bfbca0a8bf98ae531fbc1aa --- src/ch/task.cpp (.../task.cpp) (revision b13e3052f13b2f0a8c53c37a7b9246418b88bebd) +++ src/ch/task.cpp (.../task.cpp) (revision 074c36e6d7abda459bfbca0a8bf98ae531fbc1aa) @@ -41,7 +41,7 @@ m_dwError=dwError; // format some text - CString strFormat=GetResManager().LoadString(uiFmtID); + CString strFormat = GetResManager().LoadString(uiFmtID); ExpandFormatString(&strFormat, dwError); // get param list @@ -336,7 +336,6 @@ m_piFeedbackHandler(piFeedbackHandler), m_files(m_clipboard), m_stCurrentIndex(0), - m_stLastProcessedIndex(0), m_nStatus(ST_NULL_STATUS), m_pThread(NULL), m_nPriority(THREAD_PRIORITY_NORMAL), @@ -352,7 +351,7 @@ m_bSaved(false), m_lOsError(0), m_stSessionUniqueID(stSessionUniqueID), - m_localStats(), + m_localStats(), m_bRegisteredAsRunning(false) { BOOST_ASSERT(piFeedbackHandler); @@ -868,7 +867,6 @@ { KillThread(); SetStatus(ST_PAUSED, ST_WORKING_MASK); - SetLastProcessedIndex(GetCurrentIndex()); m_bSaved=false; } } @@ -1137,18 +1135,6 @@ return m_ucCurrentCopy; } -void CTask::SetLastProcessedIndex(size_t stIndex) -{ - boost::unique_lock lock(m_lock); - m_stLastProcessedIndex = stIndex; -} - -size_t CTask::GetLastProcessedIndex() -{ - boost::shared_lock lock(m_lock); - return m_stLastProcessedIndex; -} - bool CTask::GetRequiredFreeSpace(ull_t *pullNeeded, ull_t *pullAvailable) { *pullNeeded = m_localStats.GetUnProcessedSize(); // it'd be nice to round up to take cluster size into consideration, @@ -1660,8 +1646,6 @@ chcore::IFeedbackHandler* piFeedbackHandler = GetFeedbackHandler(); BOOST_ASSERT(piFeedbackHandler); - SetLastProcessedIndex(std::numeric_limits::max()); - // if dest file size >0 - we can do something more than usual if(bExist) {