Fix Compare with preview version crash problem at log dialog.

[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / LogDlg.cpp

diff --git a/src/TortoiseProc/LogDlg.cpp b/src/TortoiseProc/LogDlg.cpp
index 4eec793..e2bb8a1 100644 (file)
--- a/src/TortoiseProc/LogDlg.cpp
+++ b/src/TortoiseProc/LogDlg.cpp
@@ -216,7 +216,7 @@ BOOL CLogDlg::OnInitDialog()
        m_LogList.DeleteAllItems();\r
        m_LogList.InsertGitColumn();\r
 \r
        m_LogList.DeleteAllItems();\r
        m_LogList.InsertGitColumn();\r
 \r

-       m_ChangedFileListCtrl.Init(SVNSLC_COLEXT | SVNSLC_COLSTATUS |IDS_STATUSLIST_COLADD|IDS_STATUSLIST_COLDEL , _T("LogDlg"));\r
+       m_ChangedFileListCtrl.Init(SVNSLC_COLEXT | SVNSLC_COLSTATUS |IDS_STATUSLIST_COLADD|IDS_STATUSLIST_COLDEL , _T("LogDlg"),(SVNSLC_POPALL ^ SVNSLC_POPCOMMIT),false);\r

 \r
        GetDlgItem(IDC_LOGLIST)->UpdateData(FALSE);\r
 \r
 \r
        GetDlgItem(IDC_LOGLIST)->UpdateData(FALSE);\r
 \r


@@ -396,7 +396,7 @@ void CLogDlg::LogRunStatus(int cur)
                DialogEnableWindow(IDC_STATBUTTON, TRUE);\r
                DialogEnableWindow(IDC_REFRESH, TRUE);\r
 \r
                DialogEnableWindow(IDC_STATBUTTON, TRUE);\r
                DialogEnableWindow(IDC_REFRESH, TRUE);\r
 \r

-               PostMessage(WM_TIMER, LOGFILTER_TIMER);\r
+//             PostMessage(WM_TIMER, LOGFILTER_TIMER);\r

 \r
                //CTime time=m_LogList.GetOldestTime();\r
                CTime begin,end;\r
 \r
                //CTime time=m_LogList.GetOldestTime();\r
                CTime begin,end;\r


@@ -616,8 +616,10 @@ void CLogDlg::GetAll(bool bForceAll /* = false */)
                SetWindowText(m_sTitle + _T(" - "));\r
                break;\r
        }\r
                SetWindowText(m_sTitle + _T(" - "));\r
                break;\r
        }\r

-       m_LogList.m_bExitThread=TRUE;\r
-       ::WaitForSingleObject(m_LogList.m_LoadingThread->m_hThread,INFINITE);\r
+       //m_LogList.m_bExitThread=TRUE;\r
+       //::WaitForSingleObject(m_LogList.m_LoadingThread->m_hThread,INFINITE);\r
+\r
+       m_LogList.TerminateThread();\r

        \r
        m_LogList.Clear();\r
        m_LogList.FetchLogAsync(LogCallBack,this);\r
        \r
        m_LogList.Clear();\r
        m_LogList.FetchLogAsync(LogCallBack,this);\r


@@ -750,7 +752,14 @@ void CLogDlg::OnCancel()
        {\r
                //m_bCancelled = true;\r
                //return;\r
        {\r
                //m_bCancelled = true;\r
                //return;\r

-               m_LogList.TerminateThread();\r
+               if(m_LogList.m_bThreadRunning)\r
+               {\r
+                       //m_LogList.m_bExitThread=true;\r
+                       //WaitForSingleObject(m_LogList.m_LoadingThread->m_hThread,INFINITE);\r
+                       m_LogList.TerminateThread();\r
+               }\r
+\r
+               //m_LogList.TerminateThread();\r

        }\r
        UpdateData();\r
        if (m_bSaveStrict)\r
        }\r
        UpdateData();\r
        if (m_bSaveStrict)\r


@@ -2799,7 +2808,7 @@ void CLogDlg::UpdateLogInfoLabel()
 \r
        git_revnum_t rev1 ;\r
        git_revnum_t rev2 ;\r
 \r
        git_revnum_t rev1 ;\r
        git_revnum_t rev2 ;\r

-       long selectedrevs ;\r
+       long selectedrevs = 0;\r

        int count =m_LogList.m_arShownList.GetCount();\r
        if (count)\r
        {\r
        int count =m_LogList.m_arShownList.GetCount();\r
        if (count)\r
        {\r