From: Frank Li <lznuaa@gmail.com>
Date: Thu, 29 Jan 2009 13:16:11 +0000 (+0800)
Subject: Fix TortoiseGitBlame miss GitLogCache problem.
X-Git-Url: http://git.sourceforge.jp/view?p=tortoisegit%2FTortoiseGitJp.git;a=commitdiff_plain;h=af2aedfd45d965f57229023c3034c7a2b021362f;hp=230d27418e198b8f5578177e56a3535bf0f5b3d8;ds=sidebyside

Fix TortoiseGitBlame miss GitLogCache problem.
Fix save cache fail when close TortoiseGitBlame.

Signed-off-by: Frank Li <lznuaa@gmail.com>
---

diff --git a/src/TortoiseGitBlame/TortoiseGitBlame.vcproj b/src/TortoiseGitBlame/TortoiseGitBlame.vcproj
index 2be27be..03c18b0 100644
--- a/src/TortoiseGitBlame/TortoiseGitBlame.vcproj
+++ b/src/TortoiseGitBlame/TortoiseGitBlame.vcproj
@@ -373,6 +373,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\TortoiseProc\GitLogCache.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\TortoiseProc\gitlogcache.h"
+				>
+			</File>
+			<File
 				RelativePath="..\TortoiseProc\GitLogListBase.cpp"
 				>
 			</File>
@@ -529,19 +537,19 @@
 				>
 			</File>
 			<File
-				RelativePath=".\res\output_wnd.ico"
+				RelativePath="..\Resources\blameres\output_wnd.ico"
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\blameres\output_wnd.ico"
+				RelativePath=".\res\output_wnd.ico"
 				>
 			</File>
 			<File
-				RelativePath=".\res\output_wnd_hc.ico"
+				RelativePath="..\Resources\blameres\output_wnd_hc.ico"
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\blameres\output_wnd_hc.ico"
+				RelativePath=".\res\output_wnd_hc.ico"
 				>
 			</File>
 			<File
@@ -553,19 +561,19 @@
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\blameres\properties_hc.bmp"
+				RelativePath=".\res\properties_hc.bmp"
 				>
 			</File>
 			<File
-				RelativePath=".\res\properties_hc.bmp"
+				RelativePath="..\Resources\blameres\properties_hc.bmp"
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\blameres\properties_wnd.ico"
+				RelativePath=".\res\properties_wnd.ico"
 				>
 			</File>
 			<File
-				RelativePath=".\res\properties_wnd.ico"
+				RelativePath="..\Resources\blameres\properties_wnd.ico"
 				>
 			</File>
 			<File
@@ -577,19 +585,19 @@
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\blameres\Toolbar.bmp"
+				RelativePath=".\res\Toolbar.bmp"
 				>
 			</File>
 			<File
-				RelativePath=".\res\Toolbar.bmp"
+				RelativePath="..\Resources\blameres\Toolbar.bmp"
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\blameres\Toolbar256.bmp"
+				RelativePath=".\res\Toolbar256.bmp"
 				>
 			</File>
 			<File
-				RelativePath=".\res\Toolbar256.bmp"
+				RelativePath="..\Resources\blameres\Toolbar256.bmp"
 				>
 			</File>
 			<File
@@ -637,11 +645,11 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\Resources\blameres\TortoiseGitBlameDoc.ico"
+				RelativePath=".\res\TortoiseGitBlameDoc.ico"
 				>
 			</File>
 			<File
-				RelativePath=".\res\TortoiseGitBlameDoc.ico"
+				RelativePath="..\Resources\blameres\TortoiseGitBlameDoc.ico"
 				>
 			</File>
 			<File
diff --git a/src/TortoiseProc/GitLogCache.cpp b/src/TortoiseProc/GitLogCache.cpp
index 0e022ae..82caa0c 100644
--- a/src/TortoiseProc/GitLogCache.cpp
+++ b/src/TortoiseProc/GitLogCache.cpp
@@ -223,6 +223,9 @@ int CLogCache::RebuildCacheFile()
 }
 int CLogCache::SaveCache()
 {
+	if( this->m_NewCacheEntry.size() == 0 )
+		return 0;
+
 	bool bIsRebuild=false;
 	if(this->m_DataFile.m_hFile != CFile::hFileNull)
 		m_DataFile.Close();