From: sdottaka <none@none>
Date: Sun, 29 Dec 2013 10:01:52 +0000 (+0900)
Subject: Revert the stupid change (rev.8235) and retry to fix the crash
X-Git-Tag: 2.16.4+-jp-10~975^2~9
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=636c9fb37686d0a2a8f3eb92ec2fc00c12235426;p=winmerge-jp%2Fwinmerge-jp.git

Revert the stupid change (rev.8235) and retry to fix the crash

--HG--
branch : stable
---

diff --git a/Src/DirView.cpp b/Src/DirView.cpp
index ad0d261ab..b4a080a13 100644
--- a/Src/DirView.cpp
+++ b/Src/DirView.cpp
@@ -3284,15 +3284,17 @@ struct FileCmpReport: public IFileCmpReport
 	{
 		const DIFFITEM &di = m_pDirView->GetDiffItem(nIndex);
 		
-		sLinkPath = paths_ConcatPath(m_pDirView->GetDocument()->GetLeftBasePath(),
+		String sLinkFullPath = paths_ConcatPath(m_pDirView->GetDocument()->GetLeftBasePath(),
 			paths_ConcatPath(di.diffFileInfo[0].path, di.diffFileInfo[0].filename));
 
-		if (di.diffcode.isDirectory() || !m_pDirView->IsItemNavigableDiff(di) || IsArchiveFile(sLinkPath))
+		if (di.diffcode.isDirectory() || !m_pDirView->IsItemNavigableDiff(di) || IsArchiveFile(sLinkFullPath))
 		{
 			sLinkPath.clear();
 			return false;
 		}
 
+		sLinkPath = paths_ConcatPath(di.diffFileInfo[0].path, di.diffFileInfo[0].filename);
+
 		string_replace(sLinkPath, _T("\\"), _T("_"));
 		sLinkPath += _T(".html");