Fix git blame log dialog show nothing

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

diff --git a/src/TortoiseGitBlame/PropertiesWnd.cpp b/src/TortoiseGitBlame/PropertiesWnd.cpp
index f6c30d7..36d9afc 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
@@ -372,14 +372,23 @@ void CPropertiesWnd::UpdateProperties(GitRev *rev)
                {\r
                        CString str;\r
                        CString parentsubject;\r
-                       int index=pLogEntry->m_HashMap[rev->m_ParentHash[i]];\r
+                       int index;\r
+\r
+                       if( pLogEntry->m_HashMap.find(rev->m_ParentHash[i]) == pLogEntry->m_HashMap.end() )\r
+                       { \r
+                               index = -1;\r
+                       }\r
+                       else\r
+                       {\r
+                               index=pLogEntry->m_HashMap[rev->m_ParentHash[i]];\r
+                       }\r
                        if(index>=0)\r
-                               parentsubject=pLogEntry->at(index).m_Subject;\r
+                               parentsubject=pLogEntry->GetGitRevAt(index).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
+                                                                                       rev->m_ParentHash[i].ToString().Left(8), \r
                                                                                                parentsubject,\r
                                                                                                str\r
                                                                                        );\r