PATCH: [ 1486434 ] Copy Pathnames for right-only dir copies parent dir only

diff --git a/Src/Changes.txt b/Src/Changes.txt
index 9d18f38..770c27a 100644 (file)
--- a/Src/Changes.txt
+++ b/Src/Changes.txt
@@ -2,6 +2,10 @@ Src\Changes.txt
 Add new items to top.
 (This summarizes all changes to all files under Src, including Src\Languages.)
 
+2006-06-12 Kimmo
+ PATCH: [ 1486434 ] Copy Pathnames for right-only dir copies parent dir only
+  Src: DirView.cpp
+
 2006-05-31
  PATCH: [ 1483544 ] New compare method: by date and size
   Src: DiffWrapper.h DirScan.cpp Merge.rc PropCompare.cpp resource.h

diff --git a/Src/DirView.cpp b/Src/DirView.cpp
index 5a0f0f4..9d97b94 100644 (file)
--- a/Src/DirView.cpp
+++ b/Src/DirView.cpp
@@ -2567,8 +2567,9 @@ void CDirView::OnCopyLeftPathnames()
                {
                        strPaths += di.getLeftFilepath(GetDocument()->GetLeftBasePath());
                        strPaths += _T("\\");
-                       if (!di.isDirectory())
-                               strPaths += di.sLeftFilename;
+                       // If item is a folder then subfolder (relative to base folder)
+                       // is in filename member.
+                       strPaths += di.sLeftFilename;
                        strPaths += _T("\r\n");
                }
        }
@@ -2591,8 +2592,9 @@ void CDirView::OnCopyRightPathnames()
                {
                        strPaths += di. getRightFilepath(pDoc->GetRightBasePath());
                        strPaths += _T("\\");
-                       if (!di.isDirectory())
-                               strPaths += di.sRightFilename;
+                       // If item is a folder then subfolder (relative to base folder)
+                       // is in filename member.
+                       strPaths += di.sRightFilename;
                        strPaths += _T("\r\n");
                }
        }
@@ -2615,8 +2617,9 @@ void CDirView::OnCopyBothPathnames()
                {
                        strPaths += di.getLeftFilepath(pDoc->GetLeftBasePath());
                        strPaths += _T("\\");
-                       if (!di.isDirectory())
-                               strPaths += di.sLeftFilename;
+                       // If item is a folder then subfolder (relative to base folder)
+                       // is in filename member.
+                       strPaths += di.sLeftFilename;
                        strPaths += _T("\r\n");
                }
 
@@ -2624,8 +2627,9 @@ void CDirView::OnCopyBothPathnames()
                {
                        strPaths += di. getRightFilepath(pDoc->GetRightBasePath());
                        strPaths += _T("\\");
-                       if (!di.isDirectory())
-                               strPaths += di.sRightFilename;
+                       // If item is a folder then subfolder (relative to base folder)
+                       // is in filename member.
+                       strPaths += di.sRightFilename;
                        strPaths += _T("\r\n");
                }
        }