OSDN Git Service

Fix issue #39. HTML files were hidden in NTFS Alternate Data Streams
authorsdottaka <sdottaka@users.sourceforge.net>
Sat, 28 Nov 2015 02:35:31 +0000 (11:35 +0900)
committersdottaka <sdottaka@users.sourceforge.net>
Sat, 28 Nov 2015 02:35:31 +0000 (11:35 +0900)
Src/DirView.cpp

index 1c0ce7c..57cbfad 100644 (file)
@@ -2399,15 +2399,16 @@ struct FileCmpReport: public IFileCmpReport
                const CDiffContext& ctxt = m_pDirView->GetDiffContext();
                const DIFFITEM &di = m_pDirView->GetDiffItem(nIndex);
                
-               sLinkPath = paths_ConcatPath(ctxt.GetLeftPath(),
-                       paths_ConcatPath(di.diffFileInfo[0].path, di.diffFileInfo[0].filename));
+               String sLinkFullPath = paths_ConcatPath(ctxt.GetLeftPath(), di.diffFileInfo[0].GetFile());
 
-               if (di.diffcode.isDirectory() || !IsItemNavigableDiff(ctxt, di) || IsArchiveFile(sLinkPath))
+               if (di.diffcode.isDirectory() || !IsItemNavigableDiff(ctxt, di) || IsArchiveFile(sLinkFullPath))
                {
                        sLinkPath.clear();
                        return false;
                }
 
+               sLinkPath = di.diffFileInfo[0].GetFile();\r
+
                string_replace(sLinkPath, _T("\\"), _T("_"));
                sLinkPath += _T(".html");