OSDN Git Service

RebaseDlg: Fix Commit List show Current Rebase commit problem
authorFrank Li <lznuaa@gmail.com>
Mon, 16 Feb 2009 13:50:28 +0000 (21:50 +0800)
committerFrank Li <lznuaa@gmail.com>
Mon, 16 Feb 2009 13:50:28 +0000 (21:50 +0800)
Signed-off-by: Frank Li <lznuaa@gmail.com>
src/TortoiseProc/RebaseDlg.cpp

index d2a072a..abf30b3 100644 (file)
@@ -607,19 +607,18 @@ void CRebaseDlg::UpdateProgress()
        }\r
        \r
        if(m_CommitList.m_IsOldFirst)\r
-               prevIndex=m_CurrentRebaseIndex+1;\r
-       else\r
                prevIndex=m_CurrentRebaseIndex-1;\r
+       else\r
+               prevIndex=m_CurrentRebaseIndex+1;\r
 \r
        if(prevIndex >= 0 && prevIndex<m_CommitList.m_arShownList.GetSize())\r
        {\r
-               curRev=(GitRev*)m_CommitList.m_arShownList[prevIndex];\r
+               prevRev=(GitRev*)m_CommitList.m_arShownList[prevIndex];\r
        }\r
 \r
        if(prevRev)\r
        {\r
                prevRev->m_Action &= ~ CTGitPath::LOGACTIONS_REBASE_CURRENT;\r
-               prevRev->m_Action |= CTGitPath::LOGACTIONS_REBASE_DONE;\r
                m_CommitList.GetItemRect(prevIndex,&rect,LVIR_BOUNDS);\r
                m_CommitList.InvalidateRect(rect);\r
        }\r