Bugfix: Fix CDirView::GetItemFileNames to get path properly (as before 2003-08-07).

diff --git a/Src/DirActions.cpp b/Src/DirActions.cpp
index a37a182..58ffdbb 100644 (file)
--- a/Src/DirActions.cpp
+++ b/Src/DirActions.cpp
@@ -559,8 +559,9 @@ void CDirView::GetItemFileNames(int sel, CString& strLeft, CString& strRight) co
        const CDiffContext * ctxt = GetDiffContext();
        const DIFFITEM & di = ctxt->GetDiffAt(diffpos);
 
-       strLeft = di.getLeftFilepath();
-       strRight = di.getRightFilepath();
+       CString relpath = paths_ConcatPath(di.sSubdir, di.sfilename);
+       strLeft = paths_ConcatPath(ctxt->m_strLeft, relpath);
+       strRight = paths_ConcatPath(ctxt->m_strRight, relpath);
 }
 
 // Open selected file on specified side

diff --git a/Src/readme.txt b/Src/readme.txt
index 6f3305b..41391bc 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -19,6 +19,8 @@
   WinMerge: DirViewColItems.cpp
  Bugfix: FILE_SKIP & DIR_SKIP are being labelled as errors
   WinMerge: DirViewColItems.cpp Merge.rc resource.h
+ Bugfix: Fix CDirView::GetItemFileNames to get path properly (as before 2003-08-07).
+  WinMerge: DirActions.cpp
 
 2003-08-22 Kimmo
  PATCH: [ 787495 ] Create diffutils class (CDiffWrapper)