merge original branch.

[tortoisegit/TortoiseGitJp.git] / src / Utils / TempFile.cpp

diff --git a/src/Utils/TempFile.cpp b/src/Utils/TempFile.cpp
index d223bb4..e15fe92 100644 (file)
--- a/src/Utils/TempFile.cpp
+++ b/src/Utils/TempFile.cpp
@@ -54,9 +54,9 @@ CTGitPath CTempFiles::GetTempFilePath(bool bRemoveAtEnd, const CTGitPath& path /
                int i=0;\r
                do\r
                {\r
-                       if (!revision.m_CommitHash.IsEmpty())\r
+                       if (!((GitRev&)revision).m_CommitHash.IsEmpty())\r
                        {\r
-                               possibletempfile.Format(_T("%s%s-rev%s.git%3.3x.tmp%s"), temppath, (LPCTSTR)path.GetFileOrDirectoryName(), (LPCTSTR)revision.m_CommitHash.Left(7), i, (LPCTSTR)path.GetFileExtension());\r
+                               possibletempfile.Format(_T("%s%s-rev%s.git%3.3x.tmp%s"), temppath, (LPCTSTR)path.GetFileOrDirectoryName(), (LPCTSTR)((GitRev&)revision).m_CommitHash.ToString().Left(7), i, (LPCTSTR)path.GetFileExtension());\r
                        }\r
                        else\r
                        {\r