Index: src/ch/StatusDlg.cpp
===================================================================
diff -u -N -ra5f396da5ed5ffb3fcd9fdf22afb5a7fd07e1ab8 -rb1ecc12ba4c1f2a7b4acd6e82fc4193535e55ff0
--- src/ch/StatusDlg.cpp	(.../StatusDlg.cpp)	(revision a5f396da5ed5ffb3fcd9fdf22afb5a7fd07e1ab8)
+++ src/ch/StatusDlg.cpp	(.../StatusDlg.cpp)	(revision b1ecc12ba4c1f2a7b4acd6e82fc4193535e55ff0)
@@ -231,7 +231,7 @@
 		return;
 
 	int iCurrentBufferIndex = 0;
-	chcore::TTaskStatsSnapshotPtr spTaskStats = m_spTaskMgrStats->GetTaskStatsForSessionUniqueID(GetSelectedItemSessionUniqueID());
+	chcore::TTaskStatsSnapshotPtr spTaskStats = m_spTaskMgrStats->GetTaskStatsForTaskID(GetSelectedItemSessionUniqueID());
 	if(spTaskStats)
 	{
 		chcore::TSubTaskStatsSnapshotPtr spSubTaskStats = spTaskStats->GetSubTasksStats().GetCurrentSubTaskSnapshot();
@@ -253,7 +253,7 @@
 	{
 		POSITION pos = m_ctlStatusList.GetFirstSelectedItemPosition();
 		int nPos = m_ctlStatusList.GetNextSelectedItem(pos);
-		return m_pTasks->GetTaskBySessionUniqueID(m_ctlStatusList.GetItemData(nPos));
+		return m_pTasks->GetTaskByTaskID(m_ctlStatusList.GetItemData(nPos));
 	}
 
 	return chcore::TTaskPtr();
@@ -592,7 +592,7 @@
 void CStatusDlg::RefreshStatus()
 {
 	// remember address of a current selection
-	size_t stSelectedTaskSessionUniqueID = GetSelectedItemSessionUniqueID();
+	size_t stSelectedTaskID = GetSelectedItemSessionUniqueID();
 
 	// get all the stats needed
 	m_pTasks->GetStatsSnapshot(m_spTaskMgrStats);
@@ -608,7 +608,7 @@
 		SetTaskListEntry(stIndex, spTaskStats);
 
 		// right side update
-		if(spTaskStats->GetSessionUniqueID() == stSelectedTaskSessionUniqueID)
+		if(spTaskStats->GetTaskID() == stSelectedTaskID)
 			UpdateTaskStatsDetails(spTaskStats);
 	}
 
@@ -658,12 +658,13 @@
 	if(!spTask)
 		return;
 
-	unsigned long lResult = (unsigned long)(ShellExecute(this->m_hWnd, _T("open"), _T("notepad.exe"), spTask->GetRelatedPath(chcore::TTask::ePathType_TaskLogFile).ToString(), NULL, SW_SHOWNORMAL));
+	unsigned long lResult = (unsigned long)(ShellExecute(this->m_hWnd, _T("open"), _T("notepad.exe"),
+		spTask->GetLogPath().ToString(), NULL, SW_SHOWNORMAL));
 	if(lResult < 32)
 	{
 		ictranslate::CFormat fmt(GetResManager().LoadString(IDS_SHELLEXECUTEERROR_STRING));
 		fmt.SetParam(_t("%errno"), lResult);
-		fmt.SetParam(_t("%path"), spTask->GetRelatedPath(chcore::TTask::ePathType_TaskLogFile).ToString());
+		fmt.SetParam(_t("%path"), spTask->GetLogPath().ToString());
 		AfxMessageBox(fmt);
 	}
 }
@@ -982,7 +983,7 @@
 	lvi.iSubItem = 0;
 	lvi.pszText = (PTSTR)(PCTSTR)strStatusText;
 	lvi.cchTextMax = lstrlen(lvi.pszText);
-	lvi.lParam = spTaskStats->GetSessionUniqueID();
+	lvi.lParam = spTaskStats->GetTaskID();
 	lvi.iImage = GetImageFromStatus(spTaskStats->GetTaskState());
 	if(boost::numeric_cast<int>(stPos) < m_ctlStatusList.GetItemCount())
 		m_ctlStatusList.SetItem(&lvi);
@@ -1055,7 +1056,6 @@
 void CStatusDlg::UpdateTaskStatsDetails(const chcore::TTaskStatsSnapshotPtr& spTaskStats)
 {
 	chcore::TSubTaskStatsSnapshotPtr spSubTaskStats = spTaskStats->GetSubTasksStats().GetCurrentSubTaskSnapshot();
-	_ASSERTE(spSubTaskStats != NULL);
 	if(!spSubTaskStats)
 		return;
 
@@ -1130,7 +1130,7 @@
 
 	GetDlgItem(IDC_DESTINATIONOBJECT_STATIC)->SetWindowText(spTaskStats->GetDestinationPath());
 	GetDlgItem(IDC_THREADPRIORITY_STATIC)->SetWindowText(GetResManager().LoadString(IDS_PRIORITY0_STRING + PriorityToIndex(spTaskStats->GetThreadPriority())));
-	GetDlgItem(IDC_TASKID_STATIC)->SetWindowText(spTaskStats->GetTaskID());
+	GetDlgItem(IDC_TASKID_STATIC)->SetWindowText(spTaskStats->GetTaskName());
 }
 
 void CStatusDlg::SetWindowTitle(PCTSTR pszText)