From a5e2cc27bc4b3fd8d1a69c371a9a66ad237b1aec Mon Sep 17 00:00:00 2001 From: Frank Li Date: Fri, 23 Jan 2009 23:26:02 +0800 Subject: [PATCH] Modify branch tag color --- src/TortoiseProc/Colors.cpp | 8 ++++---- src/TortoiseProc/LogDlg.cpp | 6 ++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/TortoiseProc/Colors.cpp b/src/TortoiseProc/Colors.cpp index 4b6839a..312418c 100644 --- a/src/TortoiseProc/Colors.cpp +++ b/src/TortoiseProc/Colors.cpp @@ -34,10 +34,10 @@ CColors::COLOR_DATA CColors::m_ColorArray[]= {RenamedNode,_T("Software\\TortoiseGit\\Colors\\RenamedNode"), RGB(0, 0, 255)}, {LastCommitNode,_T("Software\\TortoiseGit\\Colors\\LastCommitNode"), RGB(200, 200, 200)}, {PropertyChanged,_T("Software\\TortoiseGit\\Colors\\PropertyChanged"), RGB(0, 50, 160)}, - {CurrentBranch,_T("Software\\TortoiseGit\\Colors\\CurrentBranch"), RGB(255, 0, 0)}, - {LocalBranch,_T("Software\\TortoiseGit\\Colors\\LocalBranch"), RGB(128, 0, 0)}, - {RemoteBranch,_T("Software\\TortoiseGit\\Colors\\RemoteBranch"), RGB(128, 128, 0)}, - {Tag,_T("Software\\TortoiseGit\\Colors\\Tag"), RGB(0, 255, 255)}, + {CurrentBranch,_T("Software\\TortoiseGit\\Colors\\CurrentBranch"), RGB(200, 0, 0)}, + {LocalBranch,_T("Software\\TortoiseGit\\Colors\\LocalBranch"), RGB(0, 195, 0)}, + {RemoteBranch,_T("Software\\TortoiseGit\\Colors\\RemoteBranch"), RGB(255, 221, 170)}, + {Tag,_T("Software\\TortoiseGit\\Colors\\Tag"), RGB(255, 255, 0)}, {BranchLine1,_T("Software\\TortoiseGit\\Colors\\BranchLine1"), RGB(0,0,0)}, {BranchLine2,_T("Software\\TortoiseGit\\Colors\\BranchLine2"), RGB(0xFF,0,0)}, {BranchLine3,_T("Software\\TortoiseGit\\Colors\\BranchLine3"), RGB(0,0xFF,0)}, diff --git a/src/TortoiseProc/LogDlg.cpp b/src/TortoiseProc/LogDlg.cpp index bcd8d73..5f8ef99 100644 --- a/src/TortoiseProc/LogDlg.cpp +++ b/src/TortoiseProc/LogDlg.cpp @@ -616,8 +616,10 @@ void CLogDlg::GetAll(bool bForceAll /* = false */) SetWindowText(m_sTitle + _T(" - ")); break; } - m_LogList.m_bExitThread=TRUE; - ::WaitForSingleObject(m_LogList.m_LoadingThread->m_hThread,INFINITE); + //m_LogList.m_bExitThread=TRUE; + //::WaitForSingleObject(m_LogList.m_LoadingThread->m_hThread,INFINITE); + + m_LogList.TerminateThread(); m_LogList.Clear(); m_LogList.FetchLogAsync(LogCallBack,this); -- 2.11.0