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 ad0d261..b4a080a 100644 (file)
--- 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);\r
+
                string_replace(sLinkPath, _T("\\"), _T("_"));
                sLinkPath += _T(".html");