merge original branch.

[tortoisegit/TortoiseGitJp.git] / src / TortoiseGitBlame / PropertiesWnd.cpp

diff --git a/src/TortoiseGitBlame/PropertiesWnd.cpp b/src/TortoiseGitBlame/PropertiesWnd.cpp
index fd8ea37..edebff3 100644 (file)
--- a/src/TortoiseGitBlame/PropertiesWnd.cpp
+++ b/src/TortoiseGitBlame/PropertiesWnd.cpp
@@ -350,7 +350,7 @@ void CPropertiesWnd::UpdateProperties(GitRev *rev)
 {\r
        if(rev)\r
        {\r
-               m_CommitHash->SetValue(rev->m_CommitHash);\r
+               m_CommitHash->SetValue(rev->m_CommitHash.ToString());\r
                m_AuthorName->SetValue(rev->m_AuthorName);\r
                m_AuthorDate->SetValue(rev->m_AuthorDate.Format(_T("%Y-%m-%d %H:%M")));\r
                m_AuthorEmail->SetValue(rev->m_AuthorEmail);    \r
@@ -374,25 +374,27 @@ void CPropertiesWnd::UpdateProperties(GitRev *rev)
                        CString parentsubject;\r
                        int index;\r
 \r
-                       if( pLogEntry->m_HashMap.find(rev->m_ParentHash[i]) == pLogEntry->m_HashMap.end() )\r
+                       GitRev *p =NULL;\r
+                       \r
+                       if( pLogEntry->m_pLogCache->m_HashMap.find(rev->m_ParentHash[i]) == pLogEntry->m_pLogCache->m_HashMap.end())\r
                        { \r
-                               index = -1;\r
+                               p=NULL;\r
                        }\r
                        else\r
                        {\r
-                               index=pLogEntry->m_HashMap[rev->m_ParentHash[i]];\r
+                               p= &pLogEntry->m_pLogCache->m_HashMap[rev->m_ParentHash[i]] ;\r
                        }\r
-                       if(index>=0)\r
-                               parentsubject=pLogEntry->at(index).m_Subject;\r
+                       if(p)\r
+                               parentsubject=p->m_Subject;\r
 \r
-                       str.Format(_T("%d - %s \n %s"),i,rev->m_ParentHash[i],parentsubject);\r
+                       str.Format(_T("%d - %s \n %s"),i,rev->m_ParentHash[i].ToString(),parentsubject);\r
                        \r
-                       CMFCPropertyGridProperty*p=new CMFCPropertyGridProperty(\r
-                                                                                       rev->m_ParentHash[i].Left(8), \r
+                       CMFCPropertyGridProperty*pProtery=new CMFCPropertyGridProperty(\r
+                                                                                       rev->m_ParentHash[i].ToString().Left(8), \r
                                                                                                parentsubject,\r
                                                                                                str\r
                                                                                        );\r
-                       m_ParentGroup->AddSubItem(p);\r
+                       m_ParentGroup->AddSubItem(pProtery);\r
                        m_ParentGroup->Expand();\r
                }\r
                for(int i=0;i<m_BaseInfoGroup->GetSubItemsCount();i++)\r