BUG: [ 2556904 ] Can't copy files from right to left

diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt
index 6eab145..4f69142 100644 (file)
--- a/Docs/Users/ChangeLog.txt
+++ b/Docs/Users/ChangeLog.txt
@@ -3,6 +3,10 @@ Numbers in parentheses refer to SourceForge.net tracker item numbers (#XXXXX) or
 to Subversion revision numbers (rXXXXX). To open the tracker item, go to URL:
 http://winmerge.org/tracker/[tracker-id]
 
+WinMerge 2.13.3
+  Bugfix: Could not copy files from right to left (#2556904)
+
+
 WinMerge 2.13.2 - 2009-01-28 (r6395)
   Register.bat should use Find with full path (#2536582)
   Bugfix: Creating new files caused message about missing files (#2515875)

diff --git a/Src/DirActions.cpp b/Src/DirActions.cpp
index ee92af1..c56c74c 100644 (file)
--- a/Src/DirActions.cpp
+++ b/Src/DirActions.cpp
@@ -271,18 +271,18 @@ void CDirView::DoCopyRightToLeft()
                        }
 
                        FileActionItem act;
-                       String sDest(srFile);
+                       String sDest(slFile);
 
                        if (GetDocument()->GetRecursive())
                        {
                                // If destination sides's relative path is empty it means we
                                // are copying unique items and need to get the real relative
                                // path from original side.
-                               if (di.right.path.empty())
+                               if (di.left.path.empty())
                                {
                                        sDest = GetDocument()->GetRightBasePath();
-                                       sDest = paths_ConcatPath(sDest, di.left.path);
-                                       sDest = paths_ConcatPath(sDest, di.left.filename);
+                                       sDest = paths_ConcatPath(sDest, di.right.path);
+                                       sDest = paths_ConcatPath(sDest, di.right.filename);
                                }
                        }