OSDN > Buscar Software > Software Development > Version Control > TortoiseGit Japanese language pack > SCM > git > TortoiseGitJp > Commit

Fork

TortoiseGitJp: Commit

TortoiseGit日本語言語ファイル作成

Fix RefLogDlg crash

Signed-off-by: Frank Li <lznuaa@gmail.com>

--- a/src/TortoiseProc/LogDataVector.cpp

+++ b/src/TortoiseProc/LogDataVector.cpp

		@@ -246,12 +246,9 @@ int CLogDataVector::ParserFromRefLog(CString ref)
246	246	}
247	247	}
248	248
249		- if(this->m_pLogCache->m_HashMap.IsExist(rev.m_CommitHash))
250		- {
251		- if(!this->m_pLogCache->m_HashMap[rev.m_CommitHash].m_IsFull)
252		- this->m_pLogCache->m_HashMap[rev.m_CommitHash].CopyFrom(rev);
253		- }else
254		- this->m_pLogCache->m_HashMap[rev.m_CommitHash].CopyFrom(rev);
	249	+ this->m_pLogCache->m_HashMap[rev.m_CommitHash]=rev;
	250	+
	251	+ this->push_back(rev.m_CommitHash);
255	252
256	253	}
257	254	return 0;

--- a/src/TortoiseProc/RefLogDlg.cpp

+++ b/src/TortoiseProc/RefLogDlg.cpp

		@@ -95,6 +95,7 @@ void CRefLogDlg::OnCbnSelchangeRef()
95	95	CString ref=m_ChooseRef.GetString();
96	96	if(m_RefList.m_RefMap.find(ref) == m_RefList.m_RefMap.end())
97	97	{
	98	+ m_RefList.m_RefMap[ref].m_pLogCache = &m_RefList.m_LogCache;
98	99	m_RefList.m_RefMap[ref].ParserFromRefLog(ref);
99	100	}
100	101	m_RefList.ClearText();

		@@ -104,7 +105,6 @@ void CRefLogDlg::OnCbnSelchangeRef()
104	105
105	106	CLogDataVector *plog;
106	107	plog = &m_RefList.m_RefMap[ref];
107		- plog->SetLogCache(&this->m_RefList.m_LogCache);
108	108
109	109	m_RefList.SetItemCountEx(plog->size());
110	110

		@@ -113,7 +113,7 @@ void CRefLogDlg::OnCbnSelchangeRef()
113	113	for(unsigned int i=0;i<m_RefList.m_RefMap[ref].size();i++)
114	114	{
115	115	plog->GetGitRevAt(i).m_IsFull=TRUE;
116		- this->m_RefList.m_arShownList.Add(&(plog->at(i)));
	116	+ this->m_RefList.m_arShownList.Add(&(plog->GetGitRevAt(i)));
117	117
118	118	}
119	119