Index: src/ch/task.h
===================================================================
diff -u -N -ref313208b7c4a113907f2f72ee0b73406081501d -r1fa2eb7e39e2f8d84868d421fe1c4f0afc58d353
--- src/ch/task.h	(.../task.h)	(revision ef313208b7c4a113907f2f72ee0b73406081501d)
+++ src/ch/task.h	(.../task.h)	(revision 1fa2eb7e39e2f8d84868d421fe1c4f0afc58d353)
@@ -95,7 +95,7 @@
 	ull_t	m_ullSizeAll;
 	int		m_nPercent;
 
-	long	m_lTimeElapsed;
+	time_t	m_timeElapsed;
 
 	unsigned char m_ucCurrentCopy;
 	unsigned char m_ucCopies;
@@ -277,12 +277,23 @@
 	void MarkTaskAsNotRunning();
 	bool IsRunning() const;
 
+	void SetTimeElapsed(time_t timeElapsed);
+	time_t GetTimeElapsed();
+
+	void EnableTimeTracking();
+	void DisableTimeTracking();
+	void UpdateTime();
+
 private:
 	volatile unsigned long long m_ullProcessedSize;
 	volatile unsigned long long m_ullTotalSize;
 
 	volatile bool m_bTaskIsRunning;
 
+	// time
+	volatile time_t m_timeElapsed;
+	volatile time_t m_timeLast;
+
 	mutable boost::shared_mutex m_lock;
 	TTasksGlobalStats* m_prtGlobalStats;
 };
@@ -433,12 +444,6 @@
 
 	void KillThread();
 
-	void CleanupAfterKill();
-	void CleanupAfterKillNL();
-
-	void UpdateTime();
-	void UpdateTimeNL();
-
 	CString GetUniqueNameNL();
 
 	void SetForceFlagNL(bool bFlag = true);
@@ -461,10 +466,6 @@
 
 	UINT m_uiResumeInterval;	// works only if the thread is off
 
-	// time
-	long m_lTimeElapsed;	// store
-	long m_lLastTime;		// not store
-
 	// feedback
 	chcore::IFeedbackHandler* m_piFeedbackHandler;