From: Frank Li Date: Thu, 29 Oct 2009 02:49:17 +0000 (+0800) Subject: Try fix a crash after commit at log dialog X-Git-Url: http://git.sourceforge.jp/view?p=tortoisegit%2FTortoiseGitJp.git;a=commitdiff_plain;h=b08065710d4eb591dd1be69a12e5645f14e97ea7 Try fix a crash after commit at log dialog Signed-off-by: Frank Li --- diff --git a/src/TortoiseProc/GitLogListBase.cpp b/src/TortoiseProc/GitLogListBase.cpp index 3f06fe1..986c780 100644 --- a/src/TortoiseProc/GitLogListBase.cpp +++ b/src/TortoiseProc/GitLogListBase.cpp @@ -2178,7 +2178,8 @@ void CGitLogListBase::Refresh() if(ret == WAIT_TIMEOUT) TerminateThread(); } - + + this->SetItemCountEx(0); this->Clear(); //Update branch and Tag info @@ -2186,7 +2187,7 @@ void CGitLogListBase::Refresh() //Assume Thread have exited //if(!m_bThreadRunning) { - this->SetItemCountEx(0); + m_logEntries.clear(); m_bExitThread=FALSE; InterlockedExchange(&m_bThreadRunning, TRUE); diff --git a/src/TortoiseProc/LogDlg.cpp b/src/TortoiseProc/LogDlg.cpp index bde64e1..6d6fd3d 100644 --- a/src/TortoiseProc/LogDlg.cpp +++ b/src/TortoiseProc/LogDlg.cpp @@ -618,12 +618,13 @@ void CLogDlg::FillLogMessageCtrl(bool bShow /* = true*/) void CLogDlg::OnBnClickedRefresh() { - m_limit = 0; + Refresh (true); } void CLogDlg::Refresh (bool /*autoGoOnline*/) { + m_limit = 0; m_LogList.Refresh(); FillLogMessageCtrl(false); }