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 (file)
--- a/src/TortoiseGitBlame/TortoiseGitBlame.vcproj
+++ b/src/TortoiseGitBlame/TortoiseGitBlame.vcproj
@@ -373,6 +373,14 @@
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath="..\TortoiseProc\GitLogCache.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\TortoiseProc\gitlogcache.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\TortoiseProc\GitLogListBase.cpp"\r
                                >\r
                        </File>\r
@@ -529,19 +537,19 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\res\output_wnd.ico"\r
+                               RelativePath="..\Resources\blameres\output_wnd.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\blameres\output_wnd.ico"\r
+                               RelativePath=".\res\output_wnd.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\res\output_wnd_hc.ico"\r
+                               RelativePath="..\Resources\blameres\output_wnd_hc.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\blameres\output_wnd_hc.ico"\r
+                               RelativePath=".\res\output_wnd_hc.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -553,19 +561,19 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\blameres\properties_hc.bmp"\r
+                               RelativePath=".\res\properties_hc.bmp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\res\properties_hc.bmp"\r
+                               RelativePath="..\Resources\blameres\properties_hc.bmp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\blameres\properties_wnd.ico"\r
+                               RelativePath=".\res\properties_wnd.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\res\properties_wnd.ico"\r
+                               RelativePath="..\Resources\blameres\properties_wnd.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -577,19 +585,19 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\blameres\Toolbar.bmp"\r
+                               RelativePath=".\res\Toolbar.bmp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\res\Toolbar.bmp"\r
+                               RelativePath="..\Resources\blameres\Toolbar.bmp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\blameres\Toolbar256.bmp"\r
+                               RelativePath=".\res\Toolbar256.bmp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\res\Toolbar256.bmp"\r
+                               RelativePath="..\Resources\blameres\Toolbar256.bmp"\r
                                >\r
                        </File>\r
                        <File\r
@@ -637,11 +645,11 @@
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\blameres\TortoiseGitBlameDoc.ico"\r
+                               RelativePath=".\res\TortoiseGitBlameDoc.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\res\TortoiseGitBlameDoc.ico"\r
+                               RelativePath="..\Resources\blameres\TortoiseGitBlameDoc.ico"\r
                                >\r
                        </File>\r
                        <File\r

diff --git a/src/TortoiseProc/GitLogCache.cpp b/src/TortoiseProc/GitLogCache.cpp
index 0e022ae..82caa0c 100644 (file)
--- a/src/TortoiseProc/GitLogCache.cpp
+++ b/src/TortoiseProc/GitLogCache.cpp
@@ -223,6 +223,9 @@ int CLogCache::RebuildCacheFile()
 }\r
 int CLogCache::SaveCache()\r
 {\r
+       if( this->m_NewCacheEntry.size() == 0 )\r
+               return 0;\r
+\r
        bool bIsRebuild=false;\r
        if(this->m_DataFile.m_hFile != CFile::hFileNull)\r
                m_DataFile.Close();\r